diff --git a/src/documentation/Jamfile b/src/documentation/Jamfile
index cbc2a8655e..cd761bf6d6 100644
--- a/src/documentation/Jamfile
+++ b/src/documentation/Jamfile
@@ -5,22 +5,38 @@ XSLTPROC ?= xsltproc ;
 rule Doc2HTML
 {
 	local source = [ FGristFiles $(1) ] ;
-	local target = $(1:S=.html) ;
+	local target = $(2) ;
+	local xslsheet = $(3) ;
+	local basedir = [ FDirName $(OBOS_DISTRO_TARGET) beos documentation $(4) ] ;
+	local paths = $(5) ;
+	local options = $(6) ;
+
+	if ! $(target) {
+		target = $(1:S=.html) ;
+	}
 
 	SEARCH on $(source) = $(SEARCH_SOURCE) ;
 
-	MakeLocate $(target) : [ FDirName $(OBOS_DISTRO_TARGET) beos documentation $(DOC_LOCATION) ] ;
+	MakeLocate $(target) : $(basedir) ;
+	if $(2) {
+		XSLBASEDIR on $(target) = "-stringparam base.dir \""$(basedir)"/\"" ; 
+	}
+	XSLSHEET on $(target) = $(xslsheet) ;
+	XSLOPTIONS on $(target) = $(options) ;
+	if ! $(2) {
+		XSLOUTPUT on $(target) = "-o \""$(target)"\"" ;
+	}
 
-        Depends $(target) : $(source) ;
-        LocalDepends doc_files : $(target) ;
-	XSLPROCPATHS on $(target) = "-path \""$(XSLPATHS:J=\ )"\"" ;
+	Depends $(target) : $(source) ;
+	LocalDepends doc_files : $(target) ;
+	XSLPROCPATHS on $(target) = "-path \""$(paths:J=\ )"\"" ;
 	Doc2HTML1 $(target) : $(source) ;
-        LocalClean clean : $(target) ;
+	LocalClean clean : $(target) ;
 }
 
 actions Doc2HTML1
 {
-	$(XSLTPROC) -xinclude $(XSLPROCPATHS) -o "$(1)" $(HTMLXSLSHEET) $(2) ;
+	$(XSLTPROC) -xinclude $(XSLPROCPATHS) $(XSLBASEDIR) $(XSLOPTIONS) $(XSLOUTPUT) $(XSLSHEET) $(2) ;
 }
 
 SEARCH on  <src!documentation>license.xml = [ FDirName $(OBOS_TOP) src documentation ] ;
diff --git a/src/documentation/haiku_book/Jamfile b/src/documentation/haiku_book/Jamfile
index 51a7a6fdce..82b0069d38 100644
--- a/src/documentation/haiku_book/Jamfile
+++ b/src/documentation/haiku_book/Jamfile
@@ -1,11 +1,10 @@
 SubDir OBOS_TOP src documentation haiku_book ;
 
-XSLPATHS = ;
-HTMLXSLSHEET = http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl ;
-DOC_LOCATION = Haiku\ Book ;
-
 Doc2HTML 
 	Haiku_Book.xml
+	: 
+	: http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl
+	: Haiku_Book
 	;
 
 local chapter_files = appkit.xml
diff --git a/src/documentation/shell_tools/Jamfile b/src/documentation/shell_tools/Jamfile
index 9db5b861ac..cd8d2d2a15 100644
--- a/src/documentation/shell_tools/Jamfile
+++ b/src/documentation/shell_tools/Jamfile
@@ -1,11 +1,12 @@
 SubDir OBOS_TOP src documentation shell_tools ;
 
-XSLPATHS = [ FDirName $(OBOS_OBJECT_TARGET) documentation Shell_Tools ] [ FDirName $(OBOS_TOP) src bin coreutils man ] ;
-HTMLXSLSHEET = http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl ;
-DOC_LOCATION = Shell\ Tools ;
-
 Doc2HTML 
 	Shell_Tools-Guide.xml
+	: index.html
+	: http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl
+	: Shell_Tools 
+	: [ FDirName $(OBOS_OBJECT_TARGET) documentation Shell_Tools ] [ FDirName $(OBOS_TOP) src bin coreutils man ] 
+	: -stringparam use.id.as.filename 1
 	;
 
 Includes [ FGristFiles Shell_Tools-Guide.xml ] : <src!bin!coreutils!man>coreutils.xml <src!documentation>license.xml ;