diff --git a/.cvsignore b/.cvsignore
index 6c60d6c..a57b13a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-tcsh-6.12.00.tar.gz
+tcsh-6.13.00.tar.gz
diff --git a/sources b/sources
index b86a3e0..92923a7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dccf1e673103594546fe74c313932428  tcsh-6.12.00.tar.gz
+11c0c9c9148652dc01270c4880d1cc6e  tcsh-6.13.00.tar.gz
diff --git a/tcsh.spec b/tcsh.spec
index 056ed84..478aa3f 100644
--- a/tcsh.spec
+++ b/tcsh.spec
@@ -2,21 +2,20 @@
 
 Summary: An enhanced version of csh, the C shell.
 Name: tcsh
-Version: 6.12
-Release: 9
+Version: 6.13
+Release: 1
 License: distributable
 Group: System Environment/Shells
 Source: ftp://ftp.astron.com/pub/tcsh/tcsh-%{version}.00.tar.gz
-Patch0: tcsh-6.10.00-utmp.patch
+Patch0: tcsh-6.13.00-utmp.patch
 Patch1: tcsh-6.09.00-termios.patch
-Patch2: tcsh-6.08.00-security.patch
 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-dspmbyte.patch
+Patch7: tcsh-6.13.00-dspmbyte.patch
 Patch8: tcsh-6.11.00-termcap.patch
 Patch9: tcsh-6.12.00-setpgrp.patch
+Patch10: tcsh-6.13.00-charset.patch
+Patch11: tcsh-6.13.00-iconv.patch
 Provides: csh = %{version}
 Prereq: fileutils, grep
 URL: http://www.tcsh.org/
@@ -35,50 +34,18 @@ like syntax.
 %setup -q -n %{name}-%{version}.00
 %patch0 -p1 -b .utmp
 %patch1 -p1 -b .termios
-# upstreamed in 6.10.00
-#%patch2 -p1 -b .security
-# XXX not applied
+# XXX Partly upstream, not applied
 #%patch3 -p1 -b .pathmax
-# upstreamed in 6.10.00
-#%patch4 -p1 -b .strcoll
-%patch5 -p1 -b .locale
 %patch6 -p1 -b .glibc_compat
 %patch7 -p1 -b .mbyte
 %patch8 -p1 -b .termcap
 %patch9 -p1 -b .setpgrp
+%patch10 -p1 -b .charset
+%patch11 -p1 -b .iconv
 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} .
-%ifarch x86_64
-# Workaround for problem with gcc-3.2.1-1 as of 2002-12-05 -ECL
-export CFLAGS="-O1 -fPIC"
-%endif
 %configure --without-hesiod
 make all
 %{__perl} tcsh.man2html
@@ -91,13 +58,28 @@ 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
 ln -sf tcsh.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/csh.1
-cat catalogs | while read lang charset language ; do
+
+while read lang 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
+		echo "%lang($lang) %{_datadir}/locale/$lang/LC_MESSAGES/tcsh"
 	fi
-done
+done > tcsh.lang << _EOF
+de german
+el greek
+en C
+es spanish
+et et
+fi finnish
+fr french
+it italian
+ja ja
+pl pl
+ru russian
+uk ukrainian
+_EOF
 
 %clean
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf ${RPM_BUILD_ROOT}
@@ -120,26 +102,20 @@ if [ ! -x %{_bindir}/tcsh ]; then
 	cat /etc/shells.rpm > /etc/shells && rm /etc/shells.rpm
 fi
 
-%files
+%files -f tcsh.lang
 %defattr(-,root,root)
 %doc FAQ Fixes NewThings complete.tcsh eight-bit.txt tcsh.html
 %{_bindir}/tcsh
 %{_bindir}/csh
 %{_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 Aug 17 2004 Miloslav Trmac <mitr@redhat.com> - 6.13-1
+- Update to tcsh-6.13.00
+- Fix charset headers in some of the translations
+- Convert translated messages to LC_CTYPE locale
+- Fix automatic dspmbyte setting
+
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt