diff --git a/make-fix_whitespace_tokenization.diff b/make-fix_whitespace_tokenization.diff
new file mode 100644
index 0000000..c5b4461
--- /dev/null
+++ b/make-fix_whitespace_tokenization.diff
@@ -0,0 +1,30 @@
+Index: make-3.82/function.c
+===================================================================
+--- make-3.82.orig/function.c
++++ make-3.82/function.c
+@@ -1133,19 +1133,14 @@ func_sort (char *o, char **argv, const c
+ 
+   /* Find the maximum number of words we'll have.  */
+   t = argv[0];
+-  wordi = 1;
+-  while (*t != '\0')
++  wordi = 0;
++  while ((p = find_next_token (&t, &len)) != 0)
+     {
+-      char c = *(t++);
+-
+-      if (! isspace ((unsigned char)c))
+-        continue;
+-
+-      ++wordi;
+-
+-      while (isspace ((unsigned char)*t))
+-        ++t;
++      ++t;
++      wordi++;
+     }
++  if (! wordi)
++    wordi = 1;
+ 
+   words = xmalloc (wordi * sizeof (char *));
+ 
diff --git a/make.changes b/make.changes
index 47a405c..359999e 100644
--- a/make.changes
+++ b/make.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr 19 15:22:27 UTC 2011 - mhopf@novell.com
+
+- make-fix_whitespace_tokenization.diff
+  Fix Savannah bug #33125 (bnc #681108):
+  Memory corruption during build of android build system.
+
 -------------------------------------------------------------------
 Tue Sep  7 17:22:32 UTC 2010 - mhopf@novell.com
 
diff --git a/make.spec b/make.spec
index 8eee79e..d263c4c 100644
--- a/make.spec
+++ b/make.spec
@@ -33,6 +33,7 @@ Patch2:         make-slowdown-parallelism.diff
 Patch3:         make-disable-broken-tests.diff
 Patch4:         make-savannah-bug30723-expand_makeflags_before_reexec.diff
 Patch5:         make-savannah-bug30612-handling_of_archives.diff
+Patch6:		make-fix_whitespace_tokenization.diff
 Patch64:        make-library-search-path.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -45,6 +46,7 @@ The GNU make command with extensive documentation.
 %patch3 -p1
 %patch4
 %patch5
+%patch6 -p1
 if [ %_lib == lib64 ]; then
 %patch64
 fi