diff --git a/bison.spec b/bison.spec
index 48fd529..e303b8d 100644
--- a/bison.spec
+++ b/bison.spec
@@ -1,7 +1,7 @@
 Summary: A GNU general-purpose parser generator.
 Name: bison
-Version: 2.1
-Release: 3
+Version: 2.2
+Release: 1
 License: GPL
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.bz2
@@ -10,8 +10,6 @@ Prereq: /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: m4 >= 1.4
 
-Patch1: bison-2.1-m4_map.patch
-
 %description
 Bison is a general purpose parser generator that converts a grammar
 description for an LALR(1) context-free grammar into a C program to
@@ -52,8 +50,6 @@ Bison manual section for more information.
 %prep
 %setup -q
 
-%patch1 -p1
-
 %build
 %configure
 make
@@ -85,7 +81,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog NEWS OChangeLog README THANKS TODO doc/FAQ
+%doc AUTHORS ChangeLog NEWS OChangeLog README THANKS TODO
 %{_mandir}/*/bison*
 %{_datadir}/bison
 %{_infodir}/bison.info*
@@ -102,6 +98,9 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon May 22 2006 Roland McGrath <roland@redhat.com> - 2.2-1
+- New upstream version 2.2
+
 * Mon May  1 2006 Roland McGrath <roland@redhat.com> - 2.1-3
 - Fix K&R parser definition when it has no arguments (#190376).