diff --git a/src/tools/boostbook.jam b/src/tools/boostbook.jam
index dda2fd662..c92dbce74 100644
--- a/src/tools/boostbook.jam
+++ b/src/tools/boostbook.jam
@@ -314,7 +314,9 @@ class boostbook-generator : generator
             # Generate HTML/PDF/PS from DOCBOOK.
             local target = [ generators.construct $(project) $(manifest)
               : $(type) : $(property-set) : $(base-target) ] ;
-            $(target[2]).set-path $(format) ;
+            local name = [ $(property-set).get <name> ] ;
+            name ?= $(format) ;
+            $(target[2]).set-path $(name) ;
             $(target[2]).depends $(catalog) ;            
 
             targets += $(target[2]) ;
diff --git a/src/tools/xsltproc.jam b/src/tools/xsltproc.jam
index 866c161bd..021ef58ea 100644
--- a/src/tools/xsltproc.jam
+++ b/src/tools/xsltproc.jam
@@ -73,7 +73,7 @@ rule compute-xslt-flags ( target : properties * )
 
 
 local rule .xsltproc ( target : source stylesheet : properties * : dirname ? : action )
-{   
+{
     STYLESHEET on $(target) = $(stylesheet) ;
     FLAGS on $(target) = [ compute-xslt-flags $(target) : $(properties) ] ;
     NAME on $(target) = $(.xsltproc) ;
@@ -83,7 +83,6 @@ local rule .xsltproc ( target : source stylesheet : properties * : dirname ? : a
         CATALOG = [ common.variable-setting-command XML_CATALOG_FILES : $(catalog) ] ;
     }
     
-    DIRECTORY on $(target) = $(dirname) ;
     $(action) $(target) : $(source) ;
 }
 
@@ -104,5 +103,5 @@ actions xslt-xsltproc
 
 actions xslt-xsltproc-dir
 {
-  $(CATALOG) "$(NAME:E=xsltproc)" $(FLAGS) --xinclude -o "$(DIRECTORY)/" "$(STYLESHEET)" "$(>)"
+  $(CATALOG) "$(NAME:E=xsltproc)" $(FLAGS) --xinclude -o "$(<:D)/" "$(STYLESHEET)" "$(>)"
 }