diff --git a/boost-fix_include_config.patch b/boost-fix_include_config.patch
new file mode 100644
index 0000000..af4e124
--- /dev/null
+++ b/boost-fix_include_config.patch
@@ -0,0 +1,11 @@
+--- /boost_1_61_0/boost/optional/optional_fwd.hpp
++++ /boost_1_61_0.new/boost/optional/optional_fwd.hpp
+@@ -16,7 +16,7 @@
+ #ifndef BOOST_OPTIONAL_OPTIONAL_FWD_FLC_19NOV2002_HPP
+ #define BOOST_OPTIONAL_OPTIONAL_FWD_FLC_19NOV2002_HPP
+ 
+-#include <boost/config/suffix.hpp>
++#include <boost/config.hpp>
+ 
+ namespace boost {
+ 
diff --git a/boost.changes b/boost.changes
index aabee6a..e8e7e19 100644
--- a/boost.changes
+++ b/boost.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Aug 18 14:40:43 UTC 2016 - mvetter@suse.com
+
+- Fix boo#994378, boo#994381, boo#994382 boo#994383:
+  Fix build issues when optional_fwd.hpp is used before
+  including boost/config.hpp 
+- Add boost-fix_include_config.patch from
+  gh#boostorg/optional#19
+
 -------------------------------------------------------------------
 Fri Aug 12 15:05:12 UTC 2016 - adrian@suse.de
 
diff --git a/boost.spec b/boost.spec
index 710286b..b946afa 100644
--- a/boost.spec
+++ b/boost.spec
@@ -88,6 +88,7 @@ Patch13:        boost-visibility.patch
 Patch14:        boost-1.57.0-python-libpython_dep.patch
 Patch15:        boost-1.57.0-python-abi_letters.patch
 Patch16:        boost-1.55.0-python-test-PyImport_AppendInittab.patch
+Patch17:        boost-fix_include_config.patch
 BuildRequires:  chrpath
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
@@ -447,6 +448,7 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {}
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p2
 
 #stupid build machinery copies .orig files
 find . -name \*.orig -exec rm {} +