diff --git a/hunspell-1.2.12.tar.bz2 b/hunspell-1.2.12.tar.bz2
new file mode 100644
index 0000000..35a8b95
--- /dev/null
+++ b/hunspell-1.2.12.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1c4f9b4b46284b143c7ca2aa3a61513349c5c56de8b1aaae377b0b2f214335d4
+size 830288
diff --git a/hunspell-1.2.8.tar.bz2 b/hunspell-1.2.8.tar.bz2
deleted file mode 100644
index 3ae0dc8..0000000
--- a/hunspell-1.2.8.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e361bd13020ca1c6f170e024c4a80aa0cbb8e3398dff6e6964c60c4740525ede
-size 633458
diff --git a/hunspell-fix-format.patch b/hunspell-fix-format.patch
deleted file mode 100644
index f262bc9..0000000
--- a/hunspell-fix-format.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/hunspell/affixmgr.cxx
-+++ src/hunspell/affixmgr.cxx
-@@ -4276,7 +4276,7 @@
-             if (strip[i] == cond[j]) in = 1;
-           } while ((j < (condl - 1)) && (cond[j] != ']'));
-           if (j == (condl - 1) && (cond[j] != ']')) {
--            HUNSPELL_WARNING(stderr, "error: line %d: missing ] in condition:\n%s\n", linenum);
-+            HUNSPELL_WARNING(stderr, "error: line %d: missing ] in condition:\n%s\n", linenum, cond);
-             return 0;
-           }
-           if ((!neg && !in) || (neg && in)) {
-@@ -4304,7 +4304,7 @@
-             if (strip[i] == cond[j]) in = 1;
-           } while ((j > 0) && (cond[j] != '['));
-           if ((j == 0) && (cond[j] != '[')) {
--            HUNSPELL_WARNING(stderr, "error: error: %d: missing ] in condition:\n%s\n", linenum);
-+            HUNSPELL_WARNING(stderr, "error: error: %d: missing ] in condition:\n%s\n", linenum, cond);
-             return 0;
-           }
-           neg = (cond[j+1] == '^') ? 1 : 0;
diff --git a/hunspell.changes b/hunspell.changes
index 33b75db..2a01ef3 100644
--- a/hunspell.changes
+++ b/hunspell.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Aug 30 12:39:42 CEST 2010 - pgajdos@suse.cz
+
+- update to 1.2.12:
+  * Maintenance release bug fixes and warnings
+- upstreamed fix-format.patch
+
 -------------------------------------------------------------------
 Sat Apr 24 11:38:17 UTC 2010 - coolo@novell.com
 
diff --git a/hunspell.spec b/hunspell.spec
index ce669e8..f097b10 100644
--- a/hunspell.spec
+++ b/hunspell.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package hunspell (Version 1.2.8)
+# spec file for package hunspell (Version 1.2.12)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,14 +19,13 @@
 Summary:        Hunspell - a spell checker and morphological analyzer library
 
 Name:           hunspell
-Version:        1.2.8
-Release:        4
+Version:        1.2.12
+Release:        1
 License:        GPLv2+ ; LGPLv2.1+ ; MPL ..
 Group:          System/Libraries
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        baselibs.conf
-Patch0:         %name-fix-format.patch
-Patch1:         %name-disable-fortify.patch
+Patch0:         %name-disable-fortify.patch
 Url:            http://hunspell.sourceforge.net/
 BuildRequires:  autoconf >= 2.59
 BuildRequires:  ncurses-devel >= 5.0
@@ -45,7 +44,7 @@ OpenOffice.org UNO module.
 
 Authors:
 --------
-    Németh László nemeth (at) OpenOffice.org
+    Németh László nemeth (at) OpenOffice.org
 
 %package tools
 License:        GPLv2+ ; LGPLv2.1+ ; MPL ..
@@ -60,7 +59,7 @@ This package contains munch and unmunch programs.
 
 Authors:
 --------
-    Németh László nemeth (at) OpenOffice.org
+    Németh László nemeth (at) OpenOffice.org
 
 %package devel
 License:        GPLv2+ ; LGPLv2.1+ ; MPL ..
@@ -76,7 +75,7 @@ Includes and definitions for developing with hunspell.
 
 Authors:
 --------
-    Németh László nemeth (at) OpenOffice.org
+    Németh László nemeth (at) OpenOffice.org
 
 %package static
 License:        GPLv2+ ; LGPLv2.1+ ; MPL ..
@@ -91,12 +90,11 @@ Static hunspell library.
 
 Authors:
 --------
-    Németh László nemeth (at) OpenOffice.org
+    Németh László nemeth (at) OpenOffice.org
 
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p0
-%patch1 -p0
 
 %build
 cp /usr/share/gettext/config.rpath .
@@ -110,6 +108,7 @@ make %{?jobs:-j%jobs}
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_bindir}/example
+install -m 644 src/tools/{,un}munch.h $RPM_BUILD_ROOT%{_includedir}
 %find_lang %{name}
 
 %check
@@ -147,6 +146,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/unmunch
 %attr(755,root,root) %{_bindir}/hunzip
 %attr(755,root,root) %{_bindir}/hzip
+%attr(755,root,root) %{_bindir}/affixcompress
+%attr(755,root,root) %{_bindir}/ispellaff2myspell
+%attr(755,root,root) %{_bindir}/makealias
+%attr(755,root,root) %{_bindir}/wordforms
+%attr(755,root,root) %{_bindir}/wordlist2hunspell
 
 %files devel
 %defattr(644,root,root,755)