diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 654e95300cc6..de0002983db4 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mlterm
-PORTVERSION=	2.2.0
+PORTVERSION=	2.3.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +17,7 @@ USE_X_PREFIX=	yes
 USE_IMLIB=	yes
 USE_GTK=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--enable-imlib
+CONFIGURE_ARGS=	--enable-imlib --enable-utmp
 INSTALLS_SHLIB=	yes
 
 MAN1=	mlterm.1
@@ -30,7 +30,18 @@ PKGNAMESUFFIX=	-noaa
 CONFIGURE_ARGS+=	--enable-anti-alias
 .endif
 
+post-configure:
+	${SED} -e "s,%%PREFIX%%,${PREFIX}," \
+               -e "s,%%PERL%%,${PERL}," \
+               < ${WRKSRC}/tool/w3mmlconfig/Makefile \
+               > ${WRKSRC}/tool/w3mmlconfig/Makefile.bak
+	${MV} ${WRKSRC}/tool/w3mmlconfig/Makefile.bak ${WRKSRC}/tool/w3mmlconfig/Makefile
+
+post-build:
+	(cd ${WRKSRC}/tool/w3mmlconfig; ${MAKE})
+
 post-install:
+	(cd ${WRKSRC}/tool/w3mmlconfig; ${MAKE} install)
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/ja/mlterm
 	${INSTALL_DATA} ${WRKSRC}/doc/ja/README.ja ${PREFIX}/share/doc/ja/mlterm
diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo
index ae268f40c788..7c9d2f6aad61 100644
--- a/x11/mlterm/distinfo
+++ b/x11/mlterm/distinfo
@@ -1 +1 @@
-MD5 (mlterm-2.2.0.tar.gz) = a8118694f4e7c78acf5ff475a74b1d52
+MD5 (mlterm-2.3.0.tar.gz) = 7537a879821690c872d9fb3a91cbfab1
diff --git a/x11/mlterm/files/patch-tool:w3mmlconfig:Makefile b/x11/mlterm/files/patch-tool:w3mmlconfig:Makefile
new file mode 100644
index 000000000000..6d94a2a6c41b
--- /dev/null
+++ b/x11/mlterm/files/patch-tool:w3mmlconfig:Makefile
@@ -0,0 +1,18 @@
+--- tool/w3mmlconfig/Makefile.orig	Sat Feb 23 14:56:55 2002
++++ tool/w3mmlconfig/Makefile	Sat Feb 23 22:21:29 2002
+@@ -1,5 +1,5 @@
+ 
+-prefix		= /usr/local
++prefix		= %%PREFIX%%
+ BIN_DIR		= $(prefix)/bin
+ LIB_DIR		= $(prefix)/libexec/w3mmlconfig
+ 
+@@ -13,7 +13,7 @@
+ DISTFILES	= Makefile w3mmlconfig.in mlconfig.cgi.in	\
+ 		mk_mlconfig-data.pl mlconfig-data section key
+ 
+-PERL		= /usr/local/bin/perl
++PERL		= %%PERL%%
+ 
+ MKDIR		= mkdir -p
+ INSTALL		= install -c
diff --git a/x11/mlterm/files/patch-tool:w3mmlconfig:mlconfig.cgi.in b/x11/mlterm/files/patch-tool:w3mmlconfig:mlconfig.cgi.in
new file mode 100644
index 000000000000..844f217fcef1
--- /dev/null
+++ b/x11/mlterm/files/patch-tool:w3mmlconfig:mlconfig.cgi.in
@@ -0,0 +1,10 @@
+--- tool/w3mmlconfig/mlconfig.cgi.in.orig	Sat Feb 23 22:18:18 2002
++++ tool/w3mmlconfig/mlconfig.cgi.in	Sat Feb 23 22:22:19 2002
+@@ -2,6 +2,7 @@
+ 
+ $DEBUG = 1;
+ 
++use lib '@CGI_BIN@';
+ require 'mlconfig-data.pl';
+ 
+ $CGI = $ENV{SCRIPT_NAME} || $0;
diff --git a/x11/mlterm/pkg-plist b/x11/mlterm/pkg-plist
index 023eb6cf43fc..5543442c3889 100644
--- a/x11/mlterm/pkg-plist
+++ b/x11/mlterm/pkg-plist
@@ -1,17 +1,21 @@
 bin/mlterm
+bin/mlclient
+bin/w3mmlconfig
 etc/mlterm/aafont
 etc/mlterm/color
 etc/mlterm/font
 etc/mlterm/key
 etc/mlterm/main
 etc/mlterm/termcap
+etc/mlterm/taafont
+etc/mlterm/tfont
 etc/mlterm/vaafont
 etc/mlterm/vfont
 etc/mlterm/xim
 lib/libkik.a
 lib/libkik.la
 lib/libkik.so
-lib/libkik.so.3
+lib/libkik.so.4
 lib/libmkf.a
 lib/libmkf.la
 lib/libmkf.so
@@ -25,7 +29,10 @@ lib/mlterm/libsample2.la
 lib/mlterm/libsample2.so
 lib/mlterm/libsample2.so.0
 libexec/mlconfig
+libexec/w3mmlconfig/mlconfig-data.pl
+libexec/w3mmlconfig/mlconfig.cgi
 %%PORTDOCS%%/share/doc/ja/mlterm/README.ja
 @dirrm etc/mlterm
 @dirrm lib/mlterm
+@dirrm libexec/w3mmlconfig
 %%PORTDOCS%%@dirrm share/doc/ja/mlterm