diff --git a/gimp-help.changes b/gimp-help.changes
index f6f5f96..9230f0c 100644
--- a/gimp-help.changes
+++ b/gimp-help.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug 17 09:23:42 UTC 2011 - dimstar@opensuse.org
+
+- Disable parallel build. The build system seems to be very
+  fragile and unreliable in this case.
+
 -------------------------------------------------------------------
 Sun Jan  9 11:18:15 CET 2011 - vuntz@opensuse.org
 
diff --git a/gimp-help.spec b/gimp-help.spec
index 348b709..0b64909 100644
--- a/gimp-help.spec
+++ b/gimp-help.spec
@@ -21,6 +21,7 @@ Name:           gimp-help
 Version:        2.6.1
 Release:        1
 # FIXME: on update, see if we still need Makefile.GNU as additional source (last check: 2.6.1). See bgo#639057.
+# FIXME: Check if parallel build reliably works again (last check: 2.6.1)
 License:        GFDLv1.2
 Summary:        Help System Data for GIMP
 Url:            http://www.gimp.org/
@@ -217,7 +218,9 @@ cp %{S:2} .
 
 %build
 %configure
-make -f Makefile.GNU %{?jobs:-j%jobs}
+#make -f Makefile.GNU %{?jobs:-j%jobs}
+# Parallel build is broken
+make -f Makefile.GNU
 
 %install
 #FIXME: we can't use the usual macro since we don't use the standard Makefile