diff --git a/libvoikko-wrong-memset.patch b/libvoikko-wrong-memset.patch
new file mode 100644
index 0000000..8053d31
--- /dev/null
+++ b/libvoikko-wrong-memset.patch
@@ -0,0 +1,13 @@
+Index: libvoikko-2.1/src/grammar/grammar.cpp
+===================================================================
+--- libvoikko-2.1.orig/src/grammar/grammar.cpp
++++ libvoikko-2.1/src/grammar/grammar.cpp
+@@ -27,7 +27,7 @@
+ namespace libvoikko {
+ 
+ void init_gc_error(voikko_grammar_error * gc_error) {
+-	memset(gc_error, 0, sizeof(gc_error));
++	memset(gc_error, 0, sizeof(voikko_grammar_error));
+ }
+ 
+ VOIKKOEXPORT voikko_grammar_error voikko_next_grammar_error_cstr(int handle, const char * text,
diff --git a/libvoikko.changes b/libvoikko.changes
index ee70863..6d91bde 100644
--- a/libvoikko.changes
+++ b/libvoikko.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 27 13:10:08 UTC 2011 - idonmez@suse.com
+
+- Fix wrong size parameter in memset call 
+ 
 -------------------------------------------------------------------
 Wed Nov 23 22:00:52 UTC 2011 - jengelh@medozas.de
 
diff --git a/libvoikko.spec b/libvoikko.spec
index e547241..57000a6 100644
--- a/libvoikko.spec
+++ b/libvoikko.spec
@@ -15,20 +15,25 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:           libvoikko
 Version:        2.1
-Release:        1
-URL:            http://voikko.sourceforge.net/
-License:        GPL-2.0+
+Release:        0
+Url:            http://voikko.sourceforge.net/
 Summary:        Spellchecker and Hyphenator for Finnish Language
+License:        GPL-2.0+
 Group:          Productivity/Text/Spell
 Source:         libvoikko-%{version}.tar.bz2
 Source99:       baselibs.conf
 # PATCH-FIX-UPSTREAM libvoikko-2.1-ac-macro-dir.diff sf#2810258 pmladek@suse.cz -- can't run autoreconf because the m4 direcotry is neither in the source tarball nor in svn
-Patch:          libvoikko-2.1-ac-macro-dir.diff
-BuildRequires:  gcc-c++ glib2-devel libmalaga-devel libtool python python-xml
+Patch1:         libvoikko-2.1-ac-macro-dir.diff
+# PATCH-FIX-UPSTREAM libvoikko-wrong-memset.patch idoenmez@suse.de -- Fix wrong size parameter in memset call
+Patch2:         libvoikko-wrong-memset.patch
+BuildRequires:  gcc-c++
+BuildRequires:  glib2-devel
+BuildRequires:  libmalaga-devel
+BuildRequires:  libtool
+BuildRequires:  python
+BuildRequires:  python-xml
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define debug_package_requires libvoikko1 = %{version}-%{release}
 
@@ -37,8 +42,8 @@ Voikko is a Finnish spellchecker and hyphenator based on Malaga and
 Suomi-Malaga.
 
 %package -n libvoikko1
-Group:          System/Libraries
 Summary:        Spellchecker and Hyphenator for Finnish Language
+Group:          System/Libraries
 Requires:       malaga-suomi
 
 %description -n libvoikko1
@@ -46,8 +51,8 @@ Voikko is a Finnish spellchecker and hyphenator based on Malaga and
 Suomi-Malaga.
 
 %package devel
-Group:          Development/Libraries/C and C++
 Summary:        Spellchecker and Hyphenator for Finnish Language
+Group:          Development/Libraries/C and C++
 Requires:       libvoikko1 = %{version} glibc-devel
 
 %description devel
@@ -55,8 +60,8 @@ Voikko is a Finnish spellchecker and hyphenator based on Malaga and
 Suomi-Malaga.
 
 %package -n voikkospell
-Group:          Productivity/Text/Spell
 Summary:        Spellchecker and Hyphenator for Finnish Language
+Group:          Productivity/Text/Spell
 Requires:       libvoikko1 = %{version}
 
 %description -n voikkospell
@@ -65,7 +70,8 @@ Suomi-Malaga.
 
 %prep
 %setup -q
-%patch
+%patch1
+%patch2 -p1
 
 %build
 autoreconf -f -i