diff --git a/.cvsignore b/.cvsignore
index 8edd080..807af01 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-bison-2.0.tar.gz
+bison-2.1.tar.bz2
diff --git a/bison.spec b/bison.spec
index 1b93781..3e3c1de 100644
--- a/bison.spec
+++ b/bison.spec
@@ -1,11 +1,10 @@
 Summary: A GNU general-purpose parser generator.
 Name: bison
-Version: 2.0
-Release: 6
+Version: 2.1
+Release: 1
 License: GPL
 Group: Development/Tools
-#Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2
-Source: http://ftp.gnu.org/gnu/bison/bison-%{version}.tar.gz
+Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2
 Url: http://www.gnu.org/software/bison/
 Prereq: /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-root
@@ -37,6 +36,16 @@ using Bison, you might want to link with this library.  This library
 is required by all Bison-generated parsers, but may be employed by
 simple programs to supply minimal support for the generated parsers.
 
+%package runtime
+Summary: Runtime support files used by Bison-generated parsers
+Group: Development/Libraries
+
+%description runtime
+The bison-runtime package contains files used at runtime by parsers
+that Bison generates.  Packages whose binaries contain parsers
+generated by Bison should depend on bison-runtime to ensure that
+these files are available.
+
 %prep
 %setup -q
 
@@ -57,6 +66,7 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/yacc
 rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
 
 %find_lang %{name}
+%find_lang %{name}-runtime
 
 gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/bison.info*
 
@@ -70,11 +80,14 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog NEWS OChangeLog README REFERENCES THANKS TODO doc/FAQ
+%doc AUTHORS ChangeLog NEWS OChangeLog README THANKS TODO doc/FAQ
 %{_mandir}/*/bison*
 %{_datadir}/bison
 %{_infodir}/bison.info*
 %{_bindir}/bison
+%{_datadir}/aclocal/bison*.m4
+
+%files -f %{name}-runtime.lang runtime
 
 %files devel
 %defattr(-,root,root)
@@ -84,6 +97,10 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Oct 14 2005 Roland McGrath <roland@redhat.com> - 2.1-1
+- New upstream version 2.1
+- New subpackage bison-runtime for i18n support files used by parsers.
+
 * Thu Apr  7 2005 Roland McGrath <roland@redhat.com> - 2.0-6
 - run test suite in %%check
 
diff --git a/sources b/sources
index 2aadfe5..24f9734 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c17f964fd5504b88b07a183420de25e3  bison-2.0.tar.gz
+ef3110077462b1140b2ae612626e8486  bison-2.1.tar.bz2
diff --git a/upstream b/upstream
index 8edd080..807af01 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-bison-2.0.tar.gz
+bison-2.1.tar.bz2
diff --git a/upstream-key.gpg b/upstream-key.gpg
index 0840349..7e88f82 100644
--- a/upstream-key.gpg
+++ b/upstream-key.gpg
@@ -1,9 +1,5 @@
-pub  1024D/69A4726B 2003-08-07 Paul Eggert <eggert@gnu.org>
-     Key fingerprint = 0977 7580 951C E87F 0F3C  83B5 D61E CB34 69A4 726B
-sub  1024g/19F945E3 2003-08-07 [expires: 2004-08-06]
-
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.4 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
 mQGiBD8yt+oRBADkmVuWjrl0k0lrYOdaczAslirKeiayAd8868d7V6GzfFc/HES4
 tFhi+okVybTAUJ6i4oKmIV0c5pNyzZ3TErHYFb40RP0FgW39SMgAIQ/H/kBMSjrq
@@ -23,6 +19,30 @@ ELVhB2ngzU1Jxfu9YwADBgP/UkK5GfBuhqY/5UessEZNs2vzRoVe/jsj4AF0zUfO
 37FbUllURV+3bK6knN6L/l77mDGh/oHqBr4drewxWN9EQMB8lhKHVunazmQ7kTcZ
 O8xnZQubASTnM6Hd7OL4wJAcpVyQOBaVsPDOf0vlqCHX+xj1T+mxJPhqZrHqmJeV
 j2iITAQYEQIADAUCPzK37QUJAeEzgAAKCRDWHss0aaRya+jOAJ96m9tB9UFY36ou
-H9CzH0gE60M9mACfXqEHT1kDN+s5z64kiKr0lNe3+9E=
-=ur9y
+H9CzH0gE60M9mACfXqEHT1kDN+s5z64kiKr0lNe3+9GZAaIEQuEYHxEEAP1h6Eyn
+sdMRGwx3/tlUoeHFjVe7fkN/JzlL5Z6oao+Y/Yf2ESBg/XB0/8FaS7CTQMHKChip
+a9Wivp+GiqzKCewULYLApLUS5WO+xJ8wGPIShIUh33Vups7rR7JGqQ98pxbTk8E/
+36zRUH6R6g0H9DPZbUxKZDWELKKSegYu3FQ7AKCpqJc9Vq8GTgFflXlGYffSENVk
+CwP/VMH3PtBfPRgwqiUrydXT95zogct+RivNzwzIsKxi+0w1BhYdCLNgXD7TA3lT
+QsgLytskVer1T1dmp6bwH5ZW05iTzSOQqq8EI4sA5AYq5JIvUmIRYKg5R+LGuDxP
+8Ruvw53NSE1hLtsC+qiQxHqcDK+t2vf8nSU7bcom92OuDZoD/3JEYfumdlrt/BR/
+Vv/dqG9kKLCoXNbuV+X4Aq8RTSOszopBUc+TJIqZNaAq13n4XUDqznhmlWq0d5x2
+CWQimDQzMn/2vjacJ/MNTdxcw+7s/rjnFy/LBWT/cRuUxgk3B+wlDHp4z5V1HLWF
+ed49y4OHWxF7qvONM3ccwABW/xnvtCBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVj
+bGEuZWR1PohkBBMRAgAkBQJC4RgfAhsDBQkFo5qABgsJCAcDAgMVAgMDFgIBAh4B
+AheAAAoJELk/YMa1xM4TocEAoI6ngp3vBGXrLRkFFibu5kNbFoIvAKClFUC21RFB
+xrC1eZoD2/df9IG/pLkCDQRC4RguEAgAutFBZGkpmjmVPG16cZDdXcAEEyKxse+s
+W3ftiv/h8x2cvEmy8x3A2tuCWf5gSJ3viawdkAp5w9d42IoC4O3COF3B7nRpR6FU
+6o193OXLrJhNjmBV5iGgyLZfkxuA686J7BP2yxUSzwJjAhyk1S+70sg3cygMLDT0
+EsID1n0Y5HWFHP5DkfNhIh0Kh4gqsCQBytO8cD/hsVSSbz+9ttDSV/LIzcCUgkJe
+O5HkxSnd/3CYB2FBIzlM0XIWvEoZ/z6shroIySIGZlxnbZXFO//nVEC4EHQ7JKyj
+7X+HvH2lumkjSnX51X0hmqBjeRvFK2gIu59DyZRTHiXtXE4Mdy+kXwADBQf+Ptps
+V+WJ1BuemoEmaDgNCuO+JxH1D04/ux7PXCxZKU1+k4vtwdDPXSDpWxpGD8XWgN9C
+if06GWHejBTgTRQoy4ygiBAo8B/vUQZdBL80z6rUuIOVg/EBUDiJV0Pz6Z7dwKfv
+Bb2+F8flhqJDdPLs6VxYddd5ZemXbBBe2KanIsyP7Pk586sTzuU7PMTcEMcizkzg
+HiMTY8zBd8+dBM7hn30/NORLsEfJpf+E4eC72TpJK4ZRfZpk03rMWBoZFziCfxjL
+XUOB44tQK0yn53vreX1jcc5urmI4z7j7yD3sypkYCwn7gpwyxPB9A6zDf9HyvWpf
+um6/jkof6fvV+OcRrYhPBBgRAgAPBQJC4RguAhsMBQkFo5qAAAoJELk/YMa1xM4T
+y7QAmgPizj1fRazw/BFTyStLPjUAFXNlAKCnTTwKv96JkWTxcIILLfibPRmnFw==
+=rfoO
 -----END PGP PUBLIC KEY BLOCK-----