diff --git a/v2/tools/quickbook.jam b/v2/tools/quickbook.jam
index e5c507690..fd7c8bdbd 100644
--- a/v2/tools/quickbook.jam
+++ b/v2/tools/quickbook.jam
@@ -128,7 +128,7 @@ feature.feature <quickbook-binary-dependencies> : : free dependency ;
 # As a last resort we rely on the shell to find 'quickbook'.
 class quickbook-binary-generator : generator
 {
-    import common modules path property-set targets ;
+    import common modules path targets ;
 
     rule run ( project name ? : property-set : sources * : multiple ? )
     {
@@ -181,20 +181,7 @@ class quickbook-binary-generator : generator
                 # we've passed the id ourselves.
                 quickbook-main-target = $(quickbook-main-target[1]) ;
 
-                # Request an empty property set to build the QuickBook with default
-                # toolset.
-                local quickbook-property-set = [ property-set.empty ] ;
-
-                # Add <variant>release to the quickbook-property-set: compiling
-                # with gcc in the default 'debug' mode generates an executable
-                # several tens of megabytes large. This may be true for
-                # other compilers as well.
-                # (In general, Boost.Spirit-based parsers ask for "aggressive
-                # inlining" although this is not strictly necessary)
-                quickbook-property-set = [ $(quickbook-property-set).add-raw <variant>release ] ;
-
-                # Generate dependencies
-                quickbook-binary-dependencies = [ $(quickbook-main-target).generate $(quickbook-property-set) ] ;
+                quickbook-binary-dependencies = [ $(quickbook-main-target).generate $(property-set) ] ;
 
                 # Ignore usage-requirements returned as first element.
                 quickbook-binary-dependencies = $(quickbook-binary-dependencies[2-]) ;
@@ -215,7 +202,7 @@ class quickbook-binary-generator : generator
             else
             {
                 ECHO "QuickBook warning: The path to the quickbook executable was" ;
-                ECHO "  not provided. Additionally couldn't find QuickBook" ;
+                ECHO "  not provided. Additionally, couldn't find QuickBook" ;
                 ECHO "  sources searching in" ;
                 ECHO "    * BOOST_ROOT/tools/quickbook" ;
                 ECHO "    * BOOST_BUILD_PATH/../../quickbook" ;