diff --git a/pillow-non-iterable.patch b/pillow-non-iterable.patch
new file mode 100644
index 0000000..e82458b
--- /dev/null
+++ b/pillow-non-iterable.patch
@@ -0,0 +1,23 @@
+From 8edbc79e7f5cf32307caf609b1a346456f8d9fb4 Mon Sep 17 00:00:00 2001
+From: Hugo <hugovk@users.noreply.github.com>
+Date: Thu, 11 Jan 2018 12:45:52 +0200
+Subject: [PATCH] Fix "TypeError: 'NoneType' object is not iterable" for PPC
+ and CRUX
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index df80c5d9b..e2c16235b 100755
+--- a/setup.py
++++ b/setup.py
+@@ -368,7 +368,7 @@ def build_extensions(self):
+ 
+                 for platform_ in arch_tp:
+                     dirs = libdirs.get(platform_, None)
+-                    if not platform_:
++                    if not dirs:
+                         continue
+                     for path in dirs:
+                         _add_directory(library_dirs, path)
diff --git a/python-Pillow.changes b/python-Pillow.changes
index 1177401..7d37852 100644
--- a/python-Pillow.changes
+++ b/python-Pillow.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 15 10:01:18 UTC 2018 - tchvatal@suse.com
+
+- Fix build fails on i586 and ppc and others:
+  * pillow-non-iterable.patch
+
 -------------------------------------------------------------------
 Fri Jan 12 12:52:24 UTC 2018 - idonmez@suse.com
 
diff --git a/python-Pillow.spec b/python-Pillow.spec
index 8f7a02b..25257a5 100644
--- a/python-Pillow.spec
+++ b/python-Pillow.spec
@@ -33,6 +33,7 @@ Url:            http://python-imaging.github.io/
 Source:         https://files.pythonhosted.org/packages/source/P/Pillow/Pillow-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM freetype-2.9.patch https://github.com/python-pillow/Pillow/issues/2954
 Patch1:         freetype-2.9.patch
+Patch2:         pillow-non-iterable.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module olefile}
 BuildRequires:  %{python_module pytest-runner}
@@ -95,7 +96,7 @@ Python Imaging Library by Fredrik Lundh and Contributors.
 
 %prep
 %setup -q -n Pillow-%{version}
-%patch1 -p1
+%autopatch -p1
 
 %build
 %python_build