diff --git a/v2/tools/boostbook.jam b/v2/tools/boostbook.jam
index fade9467c..49bfc4c4c 100644
--- a/v2/tools/boostbook.jam
+++ b/v2/tools/boostbook.jam
@@ -28,7 +28,7 @@ import build-system ;
 
 import xsltproc : xslt xslt-dir ;
 
-feature.feature format : html xhtml onehtml man pdf ps docbook fo tests
+feature.feature format : html xhtml htmlhelp onehtml man pdf ps docbook fo tests
   : incidental implicit composite ;
 
 type.register DTDXML : dtdxml ;
@@ -41,6 +41,7 @@ type.register PS : ps ;
 type.register XSLT : xsl : XML ;
 type.register HTMLDIR ;
 type.register XHTMLDIR ;
+type.register HTMLHELP ;
 type.register MANPAGES ;
 type.register TESTS : tests ;
 # Artificial target type, used to require invocation of top-level
@@ -122,6 +123,7 @@ rule init ( docbook-xsl-dir ? : docbook-dtd-dir ? : boostbook-dir ? )
     generators.register-standard boostbook.docbook-to-onehtml : DOCBOOK : HTML ;
     generators.register-standard boostbook.docbook-to-htmldir : DOCBOOK : HTMLDIR ;
     generators.register-standard boostbook.docbook-to-xhtmldir : DOCBOOK : XHTMLDIR ;
+    generators.register-standard boostbook.docbook-to-htmlhelp : DOCBOOK : HTMLHELP ;
     generators.register-standard boostbook.docbook-to-manpages : DOCBOOK : MANPAGES ;
     generators.register-standard boostbook.docbook-to-fo : DOCBOOK : FO ;
     
@@ -180,6 +182,12 @@ rule docbook-to-xhtmldir ( target : source : properties * )
   xslt-dir $(target) : $(source) $(stylesheet) : $(properties) : xhtml ;
 }
 
+rule docbook-to-htmlhelp ( target : source : properties * )
+{
+  local stylesheet = [ path.native $(.boostbook-xsl-dir)/html-help.xsl ] ;
+  xslt-dir $(target) : $(source) $(stylesheet) : $(properties) : htmlhelp ;
+}
+
 rule docbook-to-manpages ( target : source : properties * )
 {
   local stylesheet = [ path.native $(.boostbook-xsl-dir)/manpages.xsl ] ;
@@ -286,7 +294,12 @@ class boostbook-generator : generator
             case xhtml    : 
             {
                 type = XHTMLDIR ;
-                manifest = XHTML.manifest ;
+                manifest = HTML.manifest ;
+            }
+            case htmlhelp    : 
+            {
+                type = HTMLHELP ;
+                #manifest = HTML.manifest ;
             }
             
             case onehtml : type = HTML ;
@@ -406,3 +419,5 @@ rule boostbook-to-tests ( target : source : properties * )
                  : $(properties) <xsl:param>boost.root=$(boost_root) 
                  ;
 }
+
+