diff --git a/hunspell-1.2.9-stacksmash.patch b/hunspell-1.2.9-stacksmash.patch
new file mode 100644
index 0000000..e0a1918
--- /dev/null
+++ b/hunspell-1.2.9-stacksmash.patch
@@ -0,0 +1,28 @@
+--- hunspell-1.2.8/src/hunspell/hunspell.cxx	2010-03-04 10:25:06.000000000 +0000
++++ hunspell-1.2.8/src/hunspell/hunspell.cxx	2010-03-04 10:25:38.000000000 +0000
+@@ -1658,7 +1658,7 @@
+   if (!q2) return 0; // bad XML input
+   if (check_xml_par(q, "type=", "analyze")) {
+       int n = 0, s = 0;
+-      if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN)) n = analyze(slst, cw);
++      if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1)) n = analyze(slst, cw);
+       if (n == 0) return 0;
+       // convert the result to <code><a>ana1</a><a>ana2</a></code> format
+       for (int i = 0; i < n; i++) s+= strlen((*slst)[i]);
+@@ -1679,13 +1679,13 @@
+       (*slst)[0] = r;
+       return 1;
+   } else if (check_xml_par(q, "type=", "stem")) {
+-      if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN)) return stem(slst, cw);
++      if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1)) return stem(slst, cw);
+   } else if (check_xml_par(q, "type=", "generate")) {
+-      int n = get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN);
++      int n = get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1);
+       if (n == 0) return 0;
+       char * q3 = strstr(q2 + 1, "<word");
+       if (q3) {
+-        if (get_xml_par(cw2, strchr(q3, '>'), MAXWORDUTF8LEN)) {
++        if (get_xml_par(cw2, strchr(q3, '>'), MAXWORDUTF8LEN - 1)) {
+             return generate(slst, cw, cw2);
+         }
+       } else {
diff --git a/hunspell.spec b/hunspell.spec
index 2e12bf8..8c285d9 100644
--- a/hunspell.spec
+++ b/hunspell.spec
@@ -1,7 +1,7 @@
 Name:      hunspell
 Summary:   A spell checker and morphological analyzer library
 Version:   1.2.9
-Release:   1%{?dist}
+Release:   2%{?dist}
 Source:    http://downloads.sourceforge.net/%{name}/hunspell-%{version}.tar.gz
 Group:     System Environment/Libraries
 URL:       http://hunspell.sourceforge.net/
@@ -9,6 +9,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License:   LGPLv2+ or GPLv2+ or MPLv1.1
 BuildRequires: ncurses-devel
 
+Patch0:    hunspell-1.2.9-stacksmash.patch
+
 %description
 Hunspell is a spell checker and morphological analyzer library and program 
 designed for languages with rich morphology and complex word compounding or 
@@ -25,6 +27,7 @@ Includes and definitions for developing with hunspell
 
 %prep
 %setup -q
+%patch0 -p1 -b .stacksmash
 
 %build
 %configure --disable-rpath --disable-static  --with-ui --with-readline
@@ -80,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/hunspell.3.gz
 
 %changelog
+* Thu Mar 04 2010 Caolan McNamara <caolanm@redhat.com> - 1.2.9-2
+- Resolves: ooo#107768 hunspell-1.2.9-stacksmash.patch
+
 * Wed Mar 03 2010 Caolan McNamara <caolanm@redhat.com> - 1.2.9-1
 - latest version, drop all upstreamed patchs