diff --git a/boost-unrecognized-option.patch b/boost-unrecognized-option.patch
new file mode 100644
index 0000000..03a9352
--- /dev/null
+++ b/boost-unrecognized-option.patch
@@ -0,0 +1,15 @@
+Index: boost_1_58_0/tools/build/src/tools/gcc.jam
+===================================================================
+--- boost_1_58_0.orig/tools/build/src/tools/gcc.jam
++++ boost_1_58_0/tools/build/src/tools/gcc.jam
+@@ -453,10 +453,6 @@ rule setup-address-model ( targets * : s
+             local arch = [ feature.get-values architecture : $(properties) ] ;
+             if $(arch) != arm
+             {
+-                if $(model) = 32
+-                {
+-                    option = -m32 ;
+-                }
+             }
+             # For darwin, the model can be 32_64. darwin.jam will handle that
+             # on its own.
diff --git a/boost.changes b/boost.changes
index 0ca00a8..d15e3e5 100644
--- a/boost.changes
+++ b/boost.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu May 21 13:04:18 UTC 2015 - schwab@suse.de
+
+- boost-unrecognized-option.patch: remove unrecognized option -m32
+
 -------------------------------------------------------------------
 Sat May  9 09:01:32 UTC 2015 - dmueller@suse.com
 
diff --git a/boost.spec b/boost.spec
index 4b26af7..8fb7165 100644
--- a/boost.spec
+++ b/boost.spec
@@ -96,6 +96,7 @@ Patch10:        0002-Fix-a-regression-with-non-constexpr-types.patch
 Patch11:        boost-aarch64-flags.patch
 Patch12:        boost-uuid-comparison.patch
 Patch13:        boost-disable-pch-on-aarch64.patch
+Patch14:        boost-unrecognized-option.patch
 BuildRequires:  chrpath
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
@@ -433,9 +434,8 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {}
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%ifarch aarch64
 %patch13 -p1
-%endif
+%patch14 -p1
 #stupid build machinery copies .orig files
 find . -name \*.orig -exec rm {} +