diff --git a/textproc/dictfmt/Makefile b/textproc/dictfmt/Makefile
index 54241527c3d0..eb2977553389 100644
--- a/textproc/dictfmt/Makefile
+++ b/textproc/dictfmt/Makefile
@@ -6,26 +6,29 @@
 #
 
 PORTNAME=	dictfmt
-PORTVERSION=	1.6.1
+PORTVERSION=	1.9.8
 CATEGORIES=	textproc
-MASTER_SITES=	ftp://ftp.dict.org/pub/dict/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-source
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	dict
+DISTNAME=	dictd-${PORTVERSION}
 
-MAINTAINER=	fuyuki@hadaly.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Formats a DICT protocol dictionary database
 
-LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
+BUILD_DEPENDS=	aclocal:${PORTSDIR}/devel/automake
 
-NO_WRKSUBDIR=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
+USE_AUTOCONF=	yes
+WANT_AUTOCONF_VER=	253
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
 USE_GMAKE=	yes
+ALL_TARGET=	dictfmt
+INSTALL_TARGET=	install.dictfmt
 
-MAN1=		dictfmt.1
+MAN1=		dictfmt.1 dictfmt_index2suffix.1 dictfmt_index2word.1 \
+		dictunformat.1
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/dictfmt ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/dictfmt.1 ${PREFIX}/man/man1
+post-patch:
+	cd ${WRKSRC}; aclocal; ${AUTOHEADER}
 
 .include <bsd.port.mk>
diff --git a/textproc/dictfmt/distinfo b/textproc/dictfmt/distinfo
index 73c692d5957b..b06fb0f4ca1d 100644
--- a/textproc/dictfmt/distinfo
+++ b/textproc/dictfmt/distinfo
@@ -1 +1 @@
-MD5 (dictfmt-1.6.1-source.tar.gz) = 8e17b9d60b504694293be03569855898
+MD5 (dictd-1.9.8.tar.gz) = e8968c93ab3989c24a0f11d80cfea3eb
diff --git a/textproc/dictfmt/files/patch-configure.in b/textproc/dictfmt/files/patch-configure.in
new file mode 100644
index 000000000000..f27ffa55b128
--- /dev/null
+++ b/textproc/dictfmt/files/patch-configure.in
@@ -0,0 +1,12 @@
+--- configure.in.orig
++++ configure.in
+@@ -311,7 +311,8 @@
+ AC_CHECK_HEADERS(sys/resource.h sys/time.h sys/param.h sys/wait.h)
+ AC_CHECK_HEADERS(wctype.h wchar.h)
+ 
+-AC_CHECK_TYPES([wint_t, mbstate_t])
++AC_CHECK_TYPES([wint_t, mbstate_t], , ,[#include <wchar.h>])
++AC_CHECK_TYPES([wchar_t], , ,[#include <wchar.h>])
+ 
+ echo .
+ echo Checking for system constants
diff --git a/textproc/dictfmt/files/patch-dictP.h b/textproc/dictfmt/files/patch-dictP.h
new file mode 100644
index 000000000000..66150be0e39a
--- /dev/null
+++ b/textproc/dictfmt/files/patch-dictP.h
@@ -0,0 +1,19 @@
+--- dictP.h.orig
++++ dictP.h
+@@ -99,13 +99,13 @@
+ #if HAVE_WINT_T && HAVE_WCHAR_H
+ #include <wchar.h>
+ #else
+-#typedef unsigned int wint_t;
++typedef unsigned int wint_t;
+ #endif
+ 
+-#if !HAVE_WCHAR_T && HAVE_WCHAR_H
++#if HAVE_WCHAR_T && HAVE_WCHAR_H
+ #include <wchar.h>
+ #else
+-#typedef unsigned int wchar_t;
++typedef unsigned int wchar_t;
+ #endif
+ 
+ #if !HAVE_MBSTATE_T
diff --git a/textproc/dictfmt/pkg-descr b/textproc/dictfmt/pkg-descr
index 941c76ff81be..d0db1d9f6f7a 100644
--- a/textproc/dictfmt/pkg-descr
+++ b/textproc/dictfmt/pkg-descr
@@ -1,5 +1,2 @@
 dictfmt converts databases in various formats into working databases
 and indices for the DICT server.
-
-- Kimura Fuyuki
-fuyuki@hadaly.org
diff --git a/textproc/dictfmt/pkg-plist b/textproc/dictfmt/pkg-plist
index b0c8cc54d2d7..b293f2286e97 100644
--- a/textproc/dictfmt/pkg-plist
+++ b/textproc/dictfmt/pkg-plist
@@ -1 +1,6 @@
 bin/dictfmt
+bin/dictfmt_index2suffix
+bin/dictfmt_index2word
+bin/dictfmt_plugin
+bin/dictfmt_virtual
+bin/dictunformat