diff --git a/boost.spec b/boost.spec
index 1f8b66a..b298258 100644
--- a/boost.spec
+++ b/boost.spec
@@ -494,6 +494,21 @@ as that on the Boost web page (http://www.boost.org/doc/libs/%{version_enc}).
 %define boost_macros define=BOOST_NO_AUTO_PTR define=BOOST_STATECHART_USE_NATIVE_RTTI
 ./b2 %{b2_options} cxxflags="$RPM_OPT_FLAGS" %{boost_macros}
 
+# Remove exception library, but only if the symbols are not
+# actually used. For now, the only symbol that is linked is
+# should never be used as it's only available on Windows. So,
+# verify that here.
+objdump -Ctj .text -Ctj .text %{buildroot}%{package_libdir}/libboost_exception.so | \
+  grep '^[0-9a-f]\+[[:space:]]\+g[[:space:]]\+F' | \
+  sed -e 's#[0-9a-f]\+[[:space:]]\+g[[:space:]]\+F[[:space:]]\+\.text[[:space:]]\+[0-9a-f]\+[[:space:]]\+##' | \
+  diff %{SOURCE10} - || echo "WARNING: libexception symbol change?"
+rm %{buildroot}%{package_libdir}/libboost_exception.so
+rm %{buildroot}%{package_libdir}/libboost_exception.so.%{version}
+
+# not used or duplicated in boost-extra flavour
+rm -r %{buildroot}%{package_libdir}/cmake/boost_exception-*
+
+
 %check
 (cd status
  ../b2 %{?_smp_mflags} --check-libs-only
@@ -651,6 +666,11 @@ find libs -name example -exec cp {} boost-example --parents -r \;
 
 %files devel
 %license LICENSE_1_0.txt
+%dir %{_libdir}/cmake/Boost-%{version}
+%{_libdir}/cmake/Boost-%{version}/*
+# I think it's necessary to include Headers into this package
+%dir %{_libdir}/cmake/boost_headers-%{version}
+%{_libdir}/cmake/boost_headers-%{version}/*
 %{_includedir}/%{name}
 %{_libdir}/*.so
 %{_libdir}/*.a
@@ -660,6 +680,9 @@ find libs -name example -exec cp {} boost-example --parents -r \;
 %dir %{_libdir}/cmake/boost_prg_exec_monitor-%{version}
 %dir %{_libdir}/cmake/boost_test_exec_monitor-%{version}
 %dir %{_libdir}/cmake/boost_unit_test_framework-%{version}
+%{_libdir}/cmake/boost_prg_exec_monitor-%{version}/*
+%{_libdir}/cmake/boost_test_exec_monitor-%{version}/*
+%{_libdir}/cmake/boost_unit_test_framework-%{version}/*
 %{_libdir}/libboost_prg_exec_monitor.so.%{version}
 %{_libdir}/libboost_unit_test_framework.so.%{version}
 %{_libdir}/libboost_test_exec_monitor.so.%{version}
@@ -669,6 +692,9 @@ find libs -name example -exec cp {} boost-example --parents -r \;
 %dir %{_libdir}/cmake/boost_stacktrace_addr2line-%{version}
 %dir %{_libdir}/cmake/boost_stacktrace_basic-%{version}
 %dir %{_libdir}/cmake/boost_stacktrace_noop-%{version}
+%{_libdir}/cmake/boost_stacktrace_addr2line-%{version}/*
+%{_libdir}/cmake/boost_stacktrace_basic-%{version}/*
+%{_libdir}/cmake/boost_stacktrace_noop-%{version}/*
 %{_libdir}/libboost_stacktrace_addr2line.so.%{version}
 %{_libdir}/libboost_stacktrace_basic.so.%{version}
 %{_libdir}/libboost_stacktrace_noop.so.%{version}
@@ -677,6 +703,8 @@ find libs -name example -exec cp {} boost-example --parents -r \;
 %license LICENSE_1_0.txt
 %dir %{_libdir}/cmake/boost_serialization-%{version}
 %dir %{_libdir}/cmake/boost_wserialization-%{version}
+%{_libdir}/cmake/boost_serialization-%{version}/*
+%{_libdir}/cmake/boost_wserialization-%{version}/*
 %{_libdir}/libboost_serialization.so.%{version}
 %{_libdir}/libboost_wserialization.so.%{version}
 
@@ -684,6 +712,8 @@ find libs -name example -exec cp {} boost-example --parents -r \;
 %license LICENSE_1_0.txt
 %dir %{_libdir}/cmake/boost_python-%{version}
 %dir %{_libdir}/cmake/boost_numpy-%{version}
+%{_libdir}/cmake/boost_python-%{version}/*
+%{_libdir}/cmake/boost_numpy-%{version}/*
 %{_libdir}/libboost_python%{python3_version_nodots}.so.%{version}
 %{_libdir}/libboost_numpy%{python3_version_nodots}.so.%{version}
 
@@ -691,6 +721,8 @@ find libs -name example -exec cp {} boost-example --parents -r \;
 %license LICENSE_1_0.txt
 %dir %{_libdir}/cmake/boost_math_c99-%{version}
 %dir %{_libdir}/cmake/boost_math_tr1-%{version}
+%{_libdir}/cmake/boost_math_c99-%{version}/*
+%{_libdir}/cmake/boost_math_tr1-%{version}/*
 %{_libdir}/libboost_math_c99.so.%{version}
 %{_libdir}/libboost_math_c99f.so.%{version}
 %ifnarch ppc64le
@@ -706,6 +738,8 @@ find libs -name example -exec cp {} boost-example --parents -r \;
 %license LICENSE_1_0.txt
 %dir %{_libdir}/cmake/boost_log-%{version}
 %dir %{_libdir}/cmake/boost_log_setup-%{version}
+%{_libdir}/cmake/boost_log-%{version}/*
+%{_libdir}/cmake/boost_log_setup-%{version}/*
 %{_libdir}/libboost_log.so.%{version}
 %{_libdir}/libboost_log_setup.so.%{version}