diff --git a/doxygen-doc.spec b/doxygen-doc.spec
index 63be4a3..6f17274 100644
--- a/doxygen-doc.spec
+++ b/doxygen-doc.spec
@@ -29,6 +29,8 @@ Source0:        http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar
 Patch2:         doxygen-no-shared-libs.patch
 # PATCH-FIX-UPSTREAM: add missing returns to non-void functions
 Patch3:         vhdlparser-no-return.patch
+# suse specific, for ppc64le, workaround for bnc#921577
+Patch4:         doxygen-dot-one-thread.patch
 BuildRequires:  bison
 BuildRequires:  cmake >= 2.8.12
 BuildRequires:  fdupes
@@ -77,6 +79,10 @@ This package contains only documentation
 %setup -q -n doxygen-%{version} 
 %patch2 -p1
 %patch3 -p1
+%ifarch ppc64le
+# see bnc#921577
+%patch4 -p1
+%endif
 
 %build
 export CFLAGS="%{optflags} -fPIC"
diff --git a/doxygen-dot-one-thread.patch b/doxygen-dot-one-thread.patch
new file mode 100644
index 0000000..c7017e8
--- /dev/null
+++ b/doxygen-dot-one-thread.patch
@@ -0,0 +1,30 @@
+From: Michel Normand <normand@linux.vnet.ibm.com>
+Subject: doxygen ppc64le ignore DOT NUM THREADS to 0
+Date: Wed, 07 Oct 2015 14:11:22 +0200
+
+doxygen ppc64le ignore DOT NUM THREADS to 0 as a bypass to boo#921577
+
+Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
+---
+ src/dot.cpp |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+Index: doxygen-1.8.10/src/dot.cpp
+===================================================================
+--- doxygen-1.8.10.orig/src/dot.cpp
++++ doxygen-1.8.10/src/dot.cpp
+@@ -1240,9 +1240,12 @@ DotManager::DotManager() : m_dotMaps(100
+   m_queue = new DotRunnerQueue;
+   int i;
+   int numThreads = QMIN(32,Config_getInt("DOT_NUM_THREADS"));
++  if (numThreads==0) {
++    numThreads = 1;
++    msg("use single threaded despite DOT_NUM_THREADS=0 (bypass boo#921577)\n");
++  }
+   if (numThreads!=1)
+   {
+-    if (numThreads==0) numThreads = QMAX(2,QThread::idealThreadCount()+1);
+     for (i=0;i<numThreads;i++)
+     {
+       DotWorkerThread *thread = new DotWorkerThread(m_queue);
+
diff --git a/doxygen.changes b/doxygen.changes
index a57e1b6..52afb25 100644
--- a/doxygen.changes
+++ b/doxygen.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct  5 14:05:14 UTC 2015 - pgajdos@suse.com
+
+- work around Power8 double free or corruption [bnc#921577]
+  + doxygen-dot-one-thread.patch
+
 -------------------------------------------------------------------
 Thu Aug 27 07:34:04 UTC 2015 - mpluskal@suse.com
 
diff --git a/doxygen.spec b/doxygen.spec
index 25d8854..e027511 100644
--- a/doxygen.spec
+++ b/doxygen.spec
@@ -33,6 +33,8 @@ Patch1:         %{name}-no-lowercase-man-names.patch
 Patch2:         doxygen-no-shared-libs.patch
 # PATCH-FIX-UPSTREAM: add missing returns to non-void functions
 Patch3:         vhdlparser-no-return.patch
+# suse specific, for ppc64le, workaround for bnc#921577
+Patch4:         doxygen-dot-one-thread.patch
 BuildRequires:  bison
 BuildRequires:  cmake >= 2.8.12
 BuildRequires:  flex
@@ -55,6 +57,9 @@ as well.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%ifarch ppc64le
+%patch4 -p1
+%endif
 
 %build
 export CFLAGS="%{optflags} -fPIC"