diff --git a/.cvsignore b/.cvsignore
index a93e812..6c60d6c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-tcsh-6.10.tar.gz
+tcsh-6.12.00.tar.gz
diff --git a/sources b/sources
index e91e6fc..b86a3e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f459c423074d85dfaa55439eb908a053  tcsh-6.10.tar.gz
+dccf1e673103594546fe74c313932428  tcsh-6.12.00.tar.gz
diff --git a/tcsh.spec b/tcsh.spec
index ea96dbe..f793b79 100644
--- a/tcsh.spec
+++ b/tcsh.spec
@@ -2,11 +2,11 @@
 
 Summary: An enhanced version of csh, the C shell.
 Name:		tcsh
-Version:	6.10
-Release:	6
-Copyright:	distributable
+Version:	6.12
+Release:	1
+License:	distributable
 Group:		System Environment/Shells
-Source:		ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.tar.gz
+Source:		ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz
 Patch0:		tcsh-6.10.00-utmp.patch
 Patch1:		tcsh-6.09.00-termios.patch
 Patch2:		tcsh-6.08.00-security.patch
@@ -14,8 +14,8 @@ Patch3:		tcsh-6.08.00-pathmax.patch
 Patch4:		tcsh-6.09.00-strcoll.patch
 Patch5:		tcsh-6.09.00-locale.patch
 Patch6:		tcsh-6.10.00-glibc_compat.patch
-Patch7:		tcsh-6.10.00-login.patch
-Patch8:		tcsh-6.10.00-dspmbyte.patch
+Patch7:		tcsh-6.10.00-dspmbyte.patch
+Patch8:		tcsh-6.11.00-termcap.patch
 Provides:	csh = %{version}
 Prereq:		fileutils, grep
 URL:		http://www.primate.wisc.edu/software/csh-tcsh-book/
@@ -41,50 +41,75 @@ like syntax.
 #%patch4 -p1 -b .strcoll
 %patch5 -p1 -b .locale
 %patch6 -p1 -b .glibc_compat
-%patch7 -p1 -b .login
-%patch8 -p1 -b .mbyte
+%patch7 -p1 -b .mbyte
+%patch8 -p1 -b .termcap
+nroff -me eight-bit.me > eight-bit.txt
+autoreconf
+
+cat > catalogs << _EOF
+de ISO-8859-1 german
+el ISO-8859-7 greek
+en ISO-8859-1 C
+es ISO-8859-1 spanish
+et ISO-8859-1 et
+fi ISO-8859-1 finnish
+fr ISO-8859-1 french
+it ISO-8859-1 italian
+ja eucJP      ja
+pl ISO-8859-2 pl
+ru ISO-8859-5 russian
+uk ISO-8859-1 ukrainian
+_EOF
+
+cat catalogs | while read lang charset language ; do
+	if ! grep -q '^$ codeset=' nls/$language/set1 ; then
+		echo '$ codeset='$charset	>  nls/$language/set1.codeset
+		cat nls/$language/set1		>> nls/$language/set1.codeset
+		cat nls/$language/set1.codeset	>  nls/$language/set1
+		rm  nls/$language/set1.codeset
+	fi
+done
 
 %build
-
+cp /usr/share/libtool/config.{sub,guess} .
 %configure
-make LIBES="-lnsl -ltermcap -lcrypt" all catalogs
+make all
 %{__perl} tcsh.man2html
+make -C nls catalogs
 
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 ${RPM_BUILD_ROOT}%{_bindir}
-install -m 755 -s tcsh ${RPM_BUILD_ROOT}%{_bindir}/tcsh
+install -m 755 tcsh ${RPM_BUILD_ROOT}%{_bindir}/tcsh
 install -m 644 tcsh.man ${RPM_BUILD_ROOT}%{_mandir}/man1/tcsh.1
 ln -sf tcsh ${RPM_BUILD_ROOT}%{_bindir}/csh
-nroff -me eight-bit.me > eight-bit.txt
-
-for i in de el es fr it ja
-do
-    mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/locale/$i/LC_MESSAGES
+cat catalogs | while read lang charset language ; do
+	dest=${RPM_BUILD_ROOT}%{_datadir}/locale/$lang/LC_MESSAGES
+	if test -f tcsh.$language.cat ; then
+		mkdir -p $dest
+		install -m644 tcsh.$language.cat $dest/tcsh
+	fi
 done
-install -m 644 tcsh.german.cat ${RPM_BUILD_ROOT}%{_datadir}/locale/de/LC_MESSAGES/tcsh
-install -m 644 tcsh.spanish.cat ${RPM_BUILD_ROOT}%{_datadir}/locale/es/LC_MESSAGES/tcsh
-install -m 644 tcsh.french.cat ${RPM_BUILD_ROOT}%{_datadir}/locale/fr/LC_MESSAGES/tcsh
-install -m 644 tcsh.greek.cat ${RPM_BUILD_ROOT}%{_datadir}/locale/el/LC_MESSAGES/tcsh
-install -m 644 tcsh.italian.cat ${RPM_BUILD_ROOT}%{_datadir}/locale/it/LC_MESSAGES/tcsh
-install -m 644 tcsh.ja.cat ${RPM_BUILD_ROOT}%{_datadir}/locale/ja/LC_MESSAGES/tcsh
 
 %clean
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf ${RPM_BUILD_ROOT}
 
 %post
 if [ ! -f /etc/shells ]; then
-    echo "%{_bindir}/tcsh" >> /etc/shells
-    echo "%{_bindir}/csh" >> /etc/shells
+	echo "%{_bindir}/tcsh" >> /etc/shells
+	echo "%{_bindir}/csh"  >> /etc/shells
 else
-    grep '^%{_bindir}/tcsh$' /etc/shells > /dev/null || echo "%{_bindir}/tcsh" >> /etc/shells
-    grep '^%{_bindir}/csh$' /etc/shells > /dev/null || echo "%{_bindir}/csh" >> /etc/shells
+	grep -q '^%{_bindir}/tcsh$' /etc/shells || \
+	echo "%{_bindir}/tcsh" >> /etc/shells
+	grep -q '^%{_bindir}/csh$'  /etc/shells || \
+	echo "%{_bindir}/csh"  >> /etc/shells
 fi
 
 %postun
 if [ ! -x %{_bindir}/tcsh ]; then
-    grep -v '^%{_bindir}/tcsh$' /etc/shells | grep -v '^%{_bindir}/csh$'> /etc/shells.rpm
-    mv /etc/shells.rpm /etc/shells
+	grep -v '^%{_bindir}/tcsh$'  /etc/shells | \
+	grep -v '^%{_bindir}/csh$' > /etc/shells.rpm
+	cat /etc/shells.rpm > /etc/shells && rm /etc/shells.rpm
 fi
 
 %files
@@ -95,12 +120,27 @@ fi
 %{_mandir}/*/*
 %lang(de)	%{_datadir}/locale/de/LC_MESSAGES/tcsh*
 %lang(el)	%{_datadir}/locale/el/LC_MESSAGES/tcsh*
+%lang(en)	%{_datadir}/locale/en/LC_MESSAGES/tcsh*
 %lang(es)	%{_datadir}/locale/es/LC_MESSAGES/tcsh*
+%lang(et)	%{_datadir}/locale/et/LC_MESSAGES/tcsh*
+%lang(fi)	%{_datadir}/locale/fi/LC_MESSAGES/tcsh*
 %lang(fr)	%{_datadir}/locale/fr/LC_MESSAGES/tcsh*
 %lang(it)	%{_datadir}/locale/it/LC_MESSAGES/tcsh*
 %lang(ja)	%{_datadir}/locale/ja/LC_MESSAGES/tcsh*
+%lang(pl)	%{_datadir}/locale/pl/LC_MESSAGES/tcsh*
+%lang(ru)	%{_datadir}/locale/ru/LC_MESSAGES/tcsh*
+%lang(uk)	%{_datadir}/locale/uk/LC_MESSAGES/tcsh*
 
 %changelog
+* Tue Jun  4 2002 Nalin Dahyabhai <nalin@redhat.com> 6.11-1
+- update to 6.11
+
+* Thu May 23 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Thu Jan 31 2002 Bill Nottingham <notting@redhat.com>
+- rebuild in new env
+
 * Sun Jun 24 2001 Elliot Lee <sopwith@redhat.com>
 - Bump release + rebuild.