diff --git a/boost.changes b/boost.changes
index dc4ca56..c841b27 100644
--- a/boost.changes
+++ b/boost.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar  9 14:47:09 UTC 2015 - rneuhauser@suse.cz
+
+- Add quickbook subpackage
+
 -------------------------------------------------------------------
 Mon Feb 23 13:22:31 UTC 2015 - rguenther@suse.com
 
diff --git a/boost.spec b/boost.spec
index 6fe4e4c..3f1e779 100644
--- a/boost.spec
+++ b/boost.spec
@@ -27,6 +27,8 @@
 #Define to 0 to not package the pdf documentation
 %define package_pdf 1
 
+%define build_quickbook 1
+
 # Just hardcode build_mpi to 1 as soon as openmpi builds on all
 # named architectures.
 
@@ -398,6 +400,19 @@ Requires:       boost-license%{lib_appendix}
 %description -n libboost_timer%{lib_appendix}
 This package contains the Boost::Timer runtime library.
 
+%if %build_quickbook
+%package     -n quickbook
+Summary:        Documentation tool geared towards C++
+Group:          Development/Tools/Doc Generators
+Requires:       boost-license%{lib_appendix}
+#Requires:       libstdc++-devel
+
+%description -n quickbook
+QuickBook is a WikiWiki style documentation tool geared towards C++
+documentation using simple rules and markup for simple formatting
+tasks.
+%endif
+
 %prep
 %setup -q -n %{name}_%{file_version} -b 3
 #everything in the tarball has the executable flag set ...
@@ -504,6 +519,12 @@ EOF
 # perform the compilation
 ./b2 -d+2 -q --prefix=%{_prefix} --libdir=%{_libdir} --user-config=./user-config.jam
 
+%if %build_quickbook
+pushd tools/quickbook
+../../b2 --user-config=../../user-config.jam --v2 dist-bin
+popd
+%endif
+
 %if %build_docs
 cd doc
 ../b2 --user-config=../user-config.jam --v2 man
@@ -574,6 +595,11 @@ rm -f %{buildroot}%{_libdir}/*.a
 #symlink dupes
 %fdupes %buildroot
 
+%if %build_quickbook
+mkdir -p %{buildroot}%{_bindir}
+install -m 0755 dist/bin/quickbook %{buildroot}%{_bindir}/quickbook
+%endif
+
 %post -n libboost_atomic%{lib_appendix} -p /sbin/ldconfig
 %post -n libboost_container%{lib_appendix} -p /sbin/ldconfig
 %post -n libboost_context%{lib_appendix} -p /sbin/ldconfig
@@ -764,4 +790,8 @@ rm -f %{buildroot}%{_libdir}/*.a
 %doc ../%{name}_%{short_version}_pdf/*.pdf
 %endif
 
+%files -n quickbook
+%defattr(-, root, root, -)
+%{_bindir}/quickbook
+
 %changelog