diff --git a/.gitignore b/.gitignore
index f1b8335..b810e2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /orocos-bfl-c1b18e3cd8b6f57f05b08157f7b43ac0b304bd81.tar.gz
 /orocos-bfl-ddcf55e85ad8e18307b2a7bb4e6655a544b113a6.tar.gz
 /orocos-bfl-0950663123bf1361bf0f48ae09e5fc2b8299cd06.tar.gz
+/orocos-bfl-3d0d149ce519841433308a1a515d54de9b15b6c4.tar.gz
diff --git a/orocos-bfl.spec b/orocos-bfl.spec
index e538355..0a626f1 100644
--- a/orocos-bfl.spec
+++ b/orocos-bfl.spec
@@ -1,9 +1,9 @@
 Name:       orocos-bfl
-%global commit 0950663123bf1361bf0f48ae09e5fc2b8299cd06
+%global commit 3d0d149ce519841433308a1a515d54de9b15b6c4
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global checkout 20180529git%{shortcommit}
 Version:    0.8.99
-Release:    14.%{checkout}%{?dist}
+Release:    15.%{checkout}%{?dist}
 Summary:    A framework for inference in Dynamic Bayesian Networks
 
 # Explanation from upstream for multiple licenses:
@@ -19,11 +19,7 @@ Summary:    A framework for inference in Dynamic Bayesian Networks
 License:    GPLv2 with exceptions and LGPLv2+
 URL:        http://www.orocos.org/bfl/
 Source0:    https://github.com/toeklk/orocos-bayesian-filtering/archive/%{commit}/%{name}-%{commit}.tar.gz
-# Unit test test_model fails on all non-x86 arches.
-# The test results look like this package does not work on arm, thus exclude for
-# now. This is reported upstream:
-# http://bugs.orocos.org/show_bug.cgi?id=1062
-ExclusiveArch: %{ix86} x86_64
+Patch0:     orocos-bfl.i686-float-test.patch
 
 BuildRequires:  boost-devel
 BuildRequires:  cmake
@@ -60,6 +56,7 @@ The %{name}-doc package contains documentation for %{name}.
 
 %prep
 %setup -q -n orocos-bayesian-filtering-%{commit}/orocos_bfl
+%patch0 -p2
 
 %build
 export LDFLAGS='-ldl'
@@ -69,22 +66,10 @@ export LDFLAGS='-ldl'
   .
 make %{?_smp_mflags}
 
-includedirs="$(cpp -x c++ -v < /dev/null 2>&1 \
-                | sed -e '1,/#include <\.\.\.> search/d' \
-                      -e '/End of search list/,$d' | tr '\n' ' ')"
-sed -i "s|INCLUDE_PATH[[:blank:]]*= |&/usr/include/boost $includedirs|" \
-  Doxyfile
-
 doxygen
 
 %check
-# Do not run the unit tests on i686, as one of the tests will fail.
-# The test result looks like this is just a rounding error, so we assume the
-# package works on i686 and the test is not well-designed.
-# See http://bugs.orocos.org/show_bug.cgi?id=1064 for details.
-%ifnarch i686
 make %{?_smp_mflags} check
-%endif
 
 
 %install
@@ -109,6 +94,12 @@ rm -rf %{buildroot}%{_bindir}/bfl
 
 
 %changelog
+* Tue May 29 2018 Till Hofmann <thofmann@fedoraproject.org> - 0.8.99-15.20180529git3d0d149
+- Add patch to fix build error on i686
+- Re-enable all arches, as all build issues are fixed
+- Update to latest github master
+- Remove doxygen include paths to make doc sub-package truly noarch
+
 * Tue May 29 2018 Till Hofmann <thofmann@fedoraproject.org> - 0.8.99-14.20180529git0950663
 - Update to latest github master
 
diff --git a/sources b/sources
index 6d7542e..652560b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (orocos-bfl-0950663123bf1361bf0f48ae09e5fc2b8299cd06.tar.gz) = 95918d917e7b0c9489effc4b96387d4ef132d9e314aff6b25d16494ca2df2cfb607ce128dffc35ab8a6bc0813129dbf4454810474a9eee5a349e52ff1567d123
+SHA512 (orocos-bfl-3d0d149ce519841433308a1a515d54de9b15b6c4.tar.gz) = 128f34f5d97517e708295669546c4ee92ec61d78505edc7d484fdff96758bdf26cfa8d50b76d1447b1ea93293dd75d0b4f58ee2f498167fbd2919af34c090f01