diff --git a/v2/tools/quickbook.jam b/v2/tools/quickbook.jam
index 75ce9bf81..0b4e2bb62 100644
--- a/v2/tools/quickbook.jam
+++ b/v2/tools/quickbook.jam
@@ -121,6 +121,9 @@ type.register QUICKBOOK : qbk ;
 # <quickbook-binary-dependencies> targets to build QuickBook from sources.
 feature.feature <quickbook-binary> : : free ;
 feature.feature <quickbook-binary-dependencies> : : free dependency ;
+feature.feature <quickbook-define> : : free ;
+feature.feature <quickbook-indent> : : free ;
+feature.feature <quickbook-line-width> : : free ;
 
 
 # quickbook-binary-generator handles generation of the QuickBook executable, by
@@ -297,6 +300,9 @@ generators.register [ new quickbook-binary-generator quickbook.quickbook-to-boos
 toolset.flags quickbook.quickbook-to-boostbook QB-COMMAND      <quickbook-binary> ;
 toolset.flags quickbook.quickbook-to-boostbook QB-DEPENDENCIES <quickbook-binary-dependencies> ;
 toolset.flags quickbook.quickbook-to-boostbook INCLUDES        <include> ;
+toolset.flags quickbook.quickbook-to-boostbook QB-DEFINES      <quickbook-define> ;
+toolset.flags quickbook.quickbook-to-boostbook QB-INDENT       <quickbook-indent> ;
+toolset.flags quickbook.quickbook-to-boostbook QB-LINE-WIDTH   <quickbook-line-width> ;
 
 
 rule quickbook-to-boostbook ( target : source : properties * )
@@ -309,7 +315,7 @@ rule quickbook-to-boostbook ( target : source : properties * )
 
 actions quickbook-to-boostbook
 {
-    "$(QB-COMMAND)" -I"$(INCLUDES)" --output-file="$(1)" "$(2)"  
+    "$(QB-COMMAND)" -I"$(INCLUDES)" -D"$(QB-DEFINES)" --indent="$(QB-INDENT)" --linewidth="$(QB-LINE-WIDTH)" --output-file="$(1)" "$(2)"
 }