diff --git a/.cvsignore b/.cvsignore
index 79cc950..c250a7a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
+hunspell-1.2.1.tar.gz
 ispellaff2myspell
-hunspell-1.2.2.tar.gz
diff --git a/hunspell.spec b/hunspell.spec
index 7cb92d8..0a0848e 100644
--- a/hunspell.spec
+++ b/hunspell.spec
@@ -1,7 +1,7 @@
 Name:      hunspell
 Summary:   Hunspell is a spell checker and morphological analyzer library
-Version:   1.2.2
-Release:   2%{?dist}
+Version:   1.2.1
+Release:   6%{?dist}
 Source0:   http://downloads.sourceforge.net/%{name}/hunspell-%{version}.tar.gz
 Source1:   http://people.debian.org/~agmartin/misc/ispellaff2myspell
 Group:     System Environment/Libraries
@@ -10,6 +10,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License:   LGPLv2+ or GPLv2+ or MPLv1.1
 BuildRequires: libtool, ncurses-devel
 
+Patch1: hunspell-pkgconfig.patch
+Patch2: hunspell-1.2.1-1863239.badstructs.patch
+
 %description
 Hunspell is a spell checker and morphological analyzer library and program 
 designed for languages with rich morphology and complex word compounding or 
@@ -26,6 +29,8 @@ Includes and definitions for developing with hunspell
 
 %prep
 %setup -q
+%patch1 -p1 -b .pkgconfig.patch
+%patch2 -p1 -b .1863239.badstructs.patch
 # Filter unwanted Requires for the use explicitely string in ispellaff2myspell
 cat << \EOF > %{name}-req
 #!/bin/sh
@@ -85,19 +90,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/unmunch
 %{_bindir}/analyze
 %{_bindir}/chmorph
-%{_bindir}/hzip
-%{_bindir}/hunzip
 %{_bindir}/ispellaff2myspell
 %{_libdir}/pkgconfig/hunspell.pc
 
 %changelog
-* Thu Apr 17 2008 Caolan McNamara <caolanm@redhat.com> - 1.2.2-2
-- sync pkgconfig
-
-* Tue Apr 15 2008 Caolan McNamara <caolanm@redhat.com> - 1.2.2-1
-- latest version
-- drop integrated hunspell-1.2.1-1863239.badstructs.patch
-
 * Wed Mar 05 2008 Caolan McNamara <caolanm@redhat.com> - 1.2.1-6
 - add ispellaff2myspell to devel
 
diff --git a/sources b/sources
index 3c5681e..2f6cd3b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
+c504f9c2065f697e586593992dd74dae  hunspell-1.2.1.tar.gz
 1c5ea5ecd2481ddc116d65ea294acae3  ispellaff2myspell
-e8cde1130894dcd3f732248db945d0c0  hunspell-1.2.2.tar.gz