diff --git a/chinese/auto-tw-l10n/Makefile b/chinese/auto-tw-l10n/Makefile
index 2256827c0f50..06a2630f7b59 100644
--- a/chinese/auto-tw-l10n/Makefile
+++ b/chinese/auto-tw-l10n/Makefile
@@ -1,35 +1,45 @@
 # New ports collection makefile for:	zh-auto-tw-l10n
 # Date created:		7 Oct 2000
 # Whom:			"Michael C . Wu" <keichii@iteration.net>
 #
 # $FreeBSD$
 
 PORTNAME=	auto-tw-l10n
-PORTVERSION=	1.5
+PORTVERSION=	1.6
 CATEGORIES=	chinese
-MASTER_SITES=	ftp://freebsd.sinica.edu.tw/pub/statue/auto-tw-l10n/
-DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	http://bbs.ilc.edu.tw/~chinsan/ \
+		ftp://freebsd.sinica.edu.tw/pub/statue/auto-tw-l10n/
+DISTNAME=	zh-${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	chinsan.tw@gmail.com
 COMMENT=	The automatic localization for Traditional Chinese zh_TW.Big5 locale
 
+RUN_DEPENDS=	${FASTEST_CVSUP}:${PORTSDIR}/sysutils/fastest_cvsup
+
+USE_REINPLACE=	yes
 NO_BUILD=	yes
 
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-install pkg-message
+SUB_LIST=	PREFIX=${PREFIX} ZONE=${ZONE} SOURCE_DIR=${WRKSRC} \
+		WRKDIR=${WRKDIR} FASTEST_CVSUP=${FASTEST_CVSUP}
+
+FASTEST_CVSUP?=	${LOCALBASE}/bin/fastest_cvsup
+ZONE?=		tw
+
+pre-install:
+	@${SH} ${PKGINSTALL}
+	@${FIND} ${WRKSRC} -name "*.in" -delete
+
 do-install:
-#Temporary hack before adduser is modified
-#	For future adduser
-#	adduser -l10n -v $HOME
+	@# Temporary hack before adduser is modified
+	@#	For future adduser
+	@#	adduser -l10n -v $HOME
 	${MKDIR} ${PREFIX}/share/skel/zh_TW.Big5
 	${CP} ${WRKSRC}/* ${PREFIX}/share/skel/zh_TW.Big5
-	@${ECHO} "*************************************************************"
-	@${ECHO} "* English Instructions:                                     *"
-	@${ECHO} "* Please tell your users to merge their old dotfiles with   *"
-	@${ECHO} "* the new ones, in                                          *"
-	@${ECHO} "* ${PREFIX}/share/skel/zh_TW.Big5/dot.*                    *"
-	@${ECHO} "*************************************************************"
-	@${ECHO} "* 中文繁體說明:                                             *"
-	@${ECHO} "* 請告知您的使用者比對他們的舊設定跟新設定, 在              *"
-	@${ECHO} "* ${PREFIX}/share/skel/zh_TW.Big5/dot.*                    *"
-	@${ECHO} "*************************************************************"
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/chinese/auto-tw-l10n/distinfo b/chinese/auto-tw-l10n/distinfo
index 21d979d9c729..37cea5152dac 100644
--- a/chinese/auto-tw-l10n/distinfo
+++ b/chinese/auto-tw-l10n/distinfo
@@ -1,2 +1,2 @@
-MD5 (zh-auto-tw-l10n-1.5.tar.gz) = 04344301800f729a8932631f4500b656
-SIZE (zh-auto-tw-l10n-1.5.tar.gz) = 3789
+MD5 (zh-auto-tw-l10n-1.6.tar.gz) = 78be2921630d2939f17132b8948c013b
+SIZE (zh-auto-tw-l10n-1.6.tar.gz) = 4194
diff --git a/chinese/auto-tw-l10n/files/pkg-install.in b/chinese/auto-tw-l10n/files/pkg-install.in
new file mode 100644
index 000000000000..79531aa64385
--- /dev/null
+++ b/chinese/auto-tw-l10n/files/pkg-install.in
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# Date created:			20005/08/08
+# Whom:				chinsan (<chinsan.tw@gmailc.com>)
+#
+# Find the fastest cvsup server
+#
+# $FreeBSD$
+#
+
+umask 022
+PATH=/bin:/usr/bin:/usr/local/bin
+
+PREFIX=%%PREFIX%%
+SOURCE_DIR=%%SOURCE_DIR%%
+FASTEST_CVSUP=%%FASTEST_CVSUP%%
+ZONE=%%ZONE%%
+TMPFILE=%%WRKDIR%%/fastest_cvsup.result
+
+echo "===>  Detecting the fastest cvsup server..."
+${FASTEST_CVSUP} -c ${ZONE} > ${TMPFILE}
+
+SERVER1=`grep "1st" ${TMPFILE} | awk '{print $3}'`
+SERVER2=`grep "2nd" ${TMPFILE} | awk '{print $3}'`
+SERVER3=`grep "3rd" ${TMPFILE} | awk '{print $3}'`
+
+sed -e "s/%%SERVER1%%/$SERVER1/; s/%%SERVER2%%/$SERVER2/; s/%%SERVER3%%/$SERVER3/" \
+	< ${SOURCE_DIR}/make.conf.in > ${SOURCE_DIR}/make.conf
+
+exit 0
diff --git a/chinese/auto-tw-l10n/files/pkg-message.in b/chinese/auto-tw-l10n/files/pkg-message.in
new file mode 100644
index 000000000000..1fb504517f24
--- /dev/null
+++ b/chinese/auto-tw-l10n/files/pkg-message.in
@@ -0,0 +1,14 @@
+*************************************************************
+
+English Instructions:
+ Please tell your users to merge their old dotfiles with
+ the new ones, in
+ %%PREFIX%%/share/skel/zh_TW.Big5/dot.*
+
+*************************************************************
+
+中文繁體說明:
+ 請告知您的使用者比對他們的舊設定跟新設定, 在
+ %%PREFIX%%/share/skel/zh_TW.Big5/dot.*
+
+*************************************************************