diff --git a/japanese/kakasi/Makefile b/japanese/kakasi/Makefile
index ac8f1bfde542..02d473695cc6 100644
--- a/japanese/kakasi/Makefile
+++ b/japanese/kakasi/Makefile
@@ -2,31 +2,41 @@
 # $FreeBSD$
 
 PORTNAME=	kakasi
-PORTVERSION=	2.3.4
+PORTVERSION=	2.3.5
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://kakasi.namazu.org/stable/
 
 MAINTAINER=	ota@j.email.ne.jp
 COMMENT=	Kanji-Kana Simple Inverter, language filter for Japanese
 
-USE_AUTOTOOLS=	libtool
-GNU_CONFIGURE=	yes
+LICENSE=	GPLv2
 
-MANLANG=	ja
-MAN1=		kakasi.1
+GNU_CONFIGURE=	yes
+USES=		iconv libtool:oldver
 USE_LDCONFIG=	yes
 
+OPTIONS_DEFINE=	DOCS
+
+CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
 DOCS=		NEWS README README-ja TODO \
 		doc/ChangeLog.lib doc/JISYO \
 		doc/README.lib doc/README.wakati
 
-NO_STAGE=	yes
+.include <bsd.port.options.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e 's/-Wno-unused-result//' ${WRKSRC}/configure
+
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/kakasi.1 ${PREFIX}/man/${MANLANG}/man1
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/man/kakasi.1.ja \
+		${STAGEDIR}${MAN1PREFIX}/man/ja/man1/kakasi.1
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 
diff --git a/japanese/kakasi/distinfo b/japanese/kakasi/distinfo
index 44d31c307e2c..c22315bf68fe 100644
--- a/japanese/kakasi/distinfo
+++ b/japanese/kakasi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kakasi-2.3.4.tar.gz) = c272560f5c11fe45b011c4e26ada66218fb0109d5582c5876aa49c5e24718534
-SIZE (kakasi-2.3.4.tar.gz) = 1099258
+SHA256 (kakasi-2.3.5.tar.gz) = f332c008f03a8d017b09221a1ded9c0c7b61212b49a74d96f6eca3f93ba329eb
+SIZE (kakasi-2.3.5.tar.gz) = 1351215
diff --git a/japanese/kakasi/pkg-plist b/japanese/kakasi/pkg-plist
index f0224e6a809a..f70ed1e5aa70 100644
--- a/japanese/kakasi/pkg-plist
+++ b/japanese/kakasi/pkg-plist
@@ -9,15 +9,17 @@ lib/libkakasi.a
 lib/libkakasi.la
 lib/libkakasi.so
 lib/libkakasi.so.3
-%%PORTDOCS%%share/doc/kakasi/ChangeLog.lib
-%%PORTDOCS%%share/doc/kakasi/JISYO
-%%PORTDOCS%%share/doc/kakasi/NEWS
-%%PORTDOCS%%share/doc/kakasi/README
-%%PORTDOCS%%share/doc/kakasi/README-ja
-%%PORTDOCS%%share/doc/kakasi/README.lib
-%%PORTDOCS%%share/doc/kakasi/README.wakati
-%%PORTDOCS%%share/doc/kakasi/TODO
-%%PORTDOCS%%@dirrm share/doc/kakasi
-share/kakasi/itaijidict
-share/kakasi/kanwadict
-@dirrm share/kakasi
+man/ja/man1/kakasi.1.gz
+man/man1/kakasi.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.lib
+%%PORTDOCS%%%%DOCSDIR%%/JISYO
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README-ja
+%%PORTDOCS%%%%DOCSDIR%%/README.lib
+%%PORTDOCS%%%%DOCSDIR%%/README.wakati
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%DATADIR%%/itaijidict
+%%DATADIR%%/kanwadict
+@dirrm %%DATADIR%%