diff --git a/libunistring-parallel-make.patch b/libunistring-parallel-make.patch
new file mode 100644
index 0000000..0cb7429
--- /dev/null
+++ b/libunistring-parallel-make.patch
@@ -0,0 +1,27 @@
+Fix a parallel make race where cdefs.h uses the unused-parameter.h header file
+but has no dependency listed. This can result in an empty cdefs.h file which 
+results in a build failure like:
+
+| In file included from striconveh.c:30:0:
+| unistr.h:193:48: error: expected ';', ',' or ')' before '_GL_UNUSED_PARAMETER'
+| In file included from striconveh.c:30:0:
+| unistr.h:263:54: error: expected ';', ',' or ')' before '_GL_UNUSED_PARAMETER'
+
+Upstream-Status: Pending
+
+RP 2012/4/12
+
+Index: lib/Makefile.am
+===================================================================
+--- lib/Makefile.am	2012-04-12 07:45:41.450059820 +0000
++++ lib/Makefile.am	2012-04-12 07:48:45.434055559 +0000
+@@ -157,7 +157,7 @@
+ 
+ # unistring/cdefs.h is not public, but is included by other header files.
+ nobase_nodist_include_HEADERS += unistring/cdefs.h
+-unistring/cdefs.h : unistring/cdefs.in.h
++unistring/cdefs.h : unistring/cdefs.in.h $(UNUSED_PARAMETER_H)
+ 	@MKDIR_P@ unistring
+ 	rm -f $@-t $@
+ 	sed -e '/definition of _GL_UNUSED_PARAMETER/r $(UNUSED_PARAMETER_H)' \
+
diff --git a/libunistring.changes b/libunistring.changes
index 70df262..ec9c75f 100644
--- a/libunistring.changes
+++ b/libunistring.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar  4 13:47:50 UTC 2014 - pgajdos@suse.com
+
+- fix parallel build
+  * added parallel-make.patch [bnc#866723] (private)
+
 -------------------------------------------------------------------
 Wed Dec 18 19:56:18 UTC 2013 - uweigand@de.ibm.com
 
diff --git a/libunistring.spec b/libunistring.spec
index 5539549..d9e18c0 100644
--- a/libunistring.spec
+++ b/libunistring.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libunistring
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -29,6 +29,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 # Fix imported gnulib long double math tests for little-endian PowerPC
 Patch1:         libunistring-gnulib-ppc64le.patch
+# https://github.com/openembedded/oe-core/blob/master/meta/recipes-support/libunistring/libunistring/parallelmake.patch
+Patch2:         libunistring-parallel-make.patch
 
 %description
 This portable C library implements Unicode string types in three flavours:
@@ -65,6 +67,7 @@ case folding and regular expressions).
 %prep
 %setup -q
 %patch1 -p1
+%patch2
 
 %build
 %configure --disable-static --disable-rpath --docdir=%_docdir/%name