diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index 8a1994e589fe..db492360679c 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -6,39 +6,57 @@
 #
 
 PORTNAME=	tcsh
-PORTVERSION=	6.09.00
+PORTVERSION=	6.09.01
 CATEGORIES=	shells
-MASTER_SITES=	ftp://ftp.astron.com/pub/tcsh/
-DISTNAME=	tcsh-6.09
+MASTER_SITES=	${MASTER_SITE_TCSH}
+DISTNAME=	${DISTNAME_TCSH}
 
 MAINTAINER=	ports@FreeBSD.org
 
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 400021
-FORBIDDEN=	"tcsh is already in the base system"
-.endif
-
 Y2K=		ftp://ftp.astron.com/pub/tcsh/Y2K
 
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} >= 400021
+NO_BUILD=	yes
+PLIST=		${PKGDIR}/PLIST.nobuild
+DISTFILES=	# empty
+
+do-patch:
+.else
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PKGNAME}
 ALL_TARGET=	all catalogs
 INSTALL_TARGET=	install install.man
 MAN1=		tcsh.1
+MASTER_SITE_TCSH=	http://www2.wbs.ne.jp/~znc/tcsh/
+DISTNAME_TCSH=	${PORTNAME}-${PORTVERSION}
+.endif
 
+.if ${OSVERSION} >= 400021
+pre-fetch:
+	@${ECHO_MSG} "This port is just for making symlink from /bin/tcsh"
+	@${ECHO_MSG} "to ${PREFIX}/bin/tcsh and updating /etc/shells."
+
+do-install:
+	${LN} -sf /bin/tcsh ${PREFIX}/bin/tcsh
+.else
 post-install:
 	${CHOWN} bin.bin ${PREFIX}/bin/tcsh
 	${CHOWN} bin.bin ${PREFIX}/man/man1/tcsh.1
-	cd ${WRKSRC}; ${INSTALL_DATA} tcsh.C.cat ${PREFIX}/share/nls/C/tcsh.cat
-	cd ${WRKSRC}; ${INSTALL_DATA} tcsh.french.cat ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat
+	${INSTALL_DATA} ${WRKSRC}/tcsh.C.cat ${PREFIX}/share/nls/C/tcsh.cat
+	${INSTALL_DATA} ${WRKSRC}/tcsh.german.cat ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat
+	${LN} -sf ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/de_AT.ISO_8859-1/tcsh.cat
+	${LN} -sf ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/de_CH.ISO_8859-1/tcsh.cat
+	@${MKDIR} ${PREFIX}/share/nls/el_GR.ISO_8859-7
+	${INSTALL_DATA} ${WRKSRC}/tcsh.greek.cat ${PREFIX}/share/nls/el_GR.ISO_8859-7/tcsh.cat
+	${INSTALL_DATA} ${WRKSRC}/tcsh.spanish.cat ${PREFIX}/share/nls/es_ES.ISO_8859-1/tcsh.cat
+	${INSTALL_DATA} ${WRKSRC}/tcsh.finnish.cat ${PREFIX}/share/nls/fi_FI.ISO_8859-1/tcsh.cat
+	${INSTALL_DATA} ${WRKSRC}/tcsh.french.cat ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat
 	${LN} -sf ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/fr_BE.ISO_8859-1/tcsh.cat
 	${LN} -sf ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/fr_CA.ISO_8859-1/tcsh.cat
 	${LN} -sf ${PREFIX}/share/nls/fr_FR.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/fr_CH.ISO_8859-1/tcsh.cat
-	cd ${WRKSRC}; ${INSTALL_DATA} tcsh.german.cat ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat
-	${LN} -sf ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/de_AT.ISO_8859-1/tcsh.cat
-	${LN} -sf ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/de_CH.ISO_8859-1/tcsh.cat
-	install -d -o ${BINOWN} -g ${BINGRP} -m 755 ${PREFIX}/share/nls/el_GR.ISO_8859-7
-	cd ${WRKSRC}; ${INSTALL_DATA} tcsh.greek.cat ${PREFIX}/share/nls/el_GR.ISO_8859-7/tcsh.cat
+	${INSTALL_DATA} ${WRKSRC}/tcsh.italian.cat ${PREFIX}/share/nls/it_IT.ISO_8859-1/tcsh.cat
+.endif
 	@${ECHO} "Updating /etc/shells"
 	@${CP} /etc/shells /etc/shells.bak
 	@(${GREP} -v ${PREFIX}/bin/tcsh /etc/shells.bak; \
diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo
index ebbc8368b30b..85e7d96bed8c 100644
--- a/shells/tcsh/distinfo
+++ b/shells/tcsh/distinfo
@@ -1 +1 @@
-MD5 (tcsh-6.09.tar.gz) = 33511c75037cd4948ed6f1627d1793aa
+MD5 (tcsh-6.09.01.tar.gz) = 205ef6c1a9330a6e9ad7962466b297ad
diff --git a/shells/tcsh/pkg-plist b/shells/tcsh/pkg-plist
index b72379e5af0d..bf92d1abbf9a 100644
--- a/shells/tcsh/pkg-plist
+++ b/shells/tcsh/pkg-plist
@@ -1,7 +1,15 @@
 bin/tcsh
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
-@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells
+@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/bin/tcsh /etc/shells.bak; echo bin/tcsh) >/etc/shells
+@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/bin/tcsh /etc/shells.bak) >/etc/shells
 share/nls/C/tcsh.cat
+share/nls/de_DE.ISO_8859-1/tcsh.cat
+@exec ln -fs %D/%F %D/share/nls/de_AT.ISO_8859-1/tcsh.cat
+@exec ln -fs %D/%F %D/share/nls/de_CH.ISO_8859-1/tcsh.cat
+@unexec rm -f %D/share/nls/de_AT.ISO_8859-1/tcsh.cat
+@unexec rm -f %D/share/nls/de_CH.ISO_8859-1/tcsh.cat
+share/nls/el_GR.ISO_8859-7/tcsh.cat
+share/nls/es_ES.ISO_8859-1/tcsh.cat
+share/nls/fi_FI.ISO_8859-1/tcsh.cat
 share/nls/fr_FR.ISO_8859-1/tcsh.cat
 @exec ln -fs %D/%F %D/share/nls/fr_BE.ISO_8859-1/tcsh.cat
 @exec ln -fs %D/%F %D/share/nls/fr_CA.ISO_8859-1/tcsh.cat
@@ -9,9 +17,5 @@ share/nls/fr_FR.ISO_8859-1/tcsh.cat
 @unexec rm -f %D/share/nls/fr_BE.ISO_8859-1/tcsh.cat
 @unexec rm -f %D/share/nls/fr_CA.ISO_8859-1/tcsh.cat
 @unexec rm -f %D/share/nls/fr_CH.ISO_8859-1/tcsh.cat
-share/nls/de_DE.ISO_8859-1/tcsh.cat
-@exec ln -fs %D/%F %D/share/nls/de_AT.ISO_8859-1/tcsh.cat
-@exec ln -fs %D/%F %D/share/nls/de_CH.ISO_8859-1/tcsh.cat
-@unexec rm -f %D/share/nls/de_AT.ISO_8859-1/tcsh.cat
-@unexec rm -f %D/share/nls/de_CH.ISO_8859-1/tcsh.cat
-share/nls/el_GR.ISO_8859-7/tcsh.cat
+share/nls/it_IT.ISO_8859-1/tcsh.cat
+@unexec rmdir %D/share/nls/el_GR.ISO_8859-7 2>dev/null || true
diff --git a/shells/tcsh/pkg-plist.nobuild b/shells/tcsh/pkg-plist.nobuild
new file mode 100644
index 000000000000..8aa5485a3dea
--- /dev/null
+++ b/shells/tcsh/pkg-plist.nobuild
@@ -0,0 +1,4 @@
+@exec ln -sf /bin/tcsh %D/bin/tcsh
+@unexec rm -f %D/bin/tcsh
+@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/bin/tcsh /etc/shells.bak; echo %D/bin/tcsh) >/etc/shells
+@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/bin/tcsh /etc/shells.bak) >/etc/shells