diff --git a/manual/xml/book_info.xml b/manual/xml/book_info.xml
index 061e2f0133..7c6098b0e7 100644
--- a/manual/xml/book_info.xml
+++ b/manual/xml/book_info.xml
@@ -2,7 +2,7 @@
 
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 
-<!ENTITY % BOOK_ENTITIES SYSTEM "./entities.ent">
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../build/manual/ent/entities.ent">
 %BOOK_ENTITIES;
 
 ]>
diff --git a/manual/xml/entities.ent.in b/manual/xml/entities.ent.in
index 7590a9b045..8c488458dd 100644
--- a/manual/xml/entities.ent.in
+++ b/manual/xml/entities.ent.in
@@ -4,8 +4,8 @@
 <!ENTITY BOOKDATE "2007-01-13"> <!-- change revision date here -->
 <!ENTITY BOOKID "&BOOKNAME;-&BOOKVERSION; (&BOOKDATE;)">
 
-<!ENTITY ARDOUR_NAME "ardour">
-<!ENTITY ARDOUR_VERSION "%VERSION%">
+<!ENTITY ARDOUR_NAME "Ardour">
+<!ENTITY ARDOUR_VERSION "@VERSION@">
 <!ENTITY ARDOUR_COMMAND "<command>ardour3</command>">
 <!ENTITY ARDOUR_APPLICATION "<application>&ARDOUR_NAME;</application>">
 <!ENTITY COPYRIGHT_HOLDER "&ARDOUR_NAME; Foundation">
diff --git a/manual/xml/formatting_conventions.xml b/manual/xml/formatting_conventions.xml
index 3908a53480..f9d89ae9f0 100644
--- a/manual/xml/formatting_conventions.xml
+++ b/manual/xml/formatting_conventions.xml
@@ -15,8 +15,7 @@
 
     <para>
       Key commands such as <keycombo><keycap>Ctrl</keycap><keycap>a</keycap>
-      </keycombo> mean "Hold down the Ctrl key and press the 'a' key". New
-      and important terms are written like this.
+      </keycombo> mean "Hold down the Ctrl key and press the 'a' key".
     </para>
 
     <para>
@@ -26,7 +25,7 @@
 
     <para>
       The name of a menu item is shown like <guimenuitem>This</guimenuitem>,
-      and nested menu items will appear like <menuchoice>
+      and nested menu items will appear as <menuchoice>
       <guimenu>Menu</guimenu> <guisubmenu>Sub Menu</guisubmenu>
       </menuchoice>
     </para>
diff --git a/manual/xsl/html.xsl b/manual/xsl/html.xsl
index f8ddf14e34..170cd3329a 100644
--- a/manual/xsl/html.xsl
+++ b/manual/xsl/html.xsl
@@ -4,10 +4,10 @@
 				version="1.0"
 				exclude-result-prefixes="exsl">
 
-<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/xhtml/docbook.xsl"/>
-<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/xhtml/chunk-common.xsl"/>
-<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/xhtml/chunk-code.xsl"/>
-<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/xhtml/manifest.xsl"/>
+<xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/xhtml/docbook.xsl"/>
+<xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/xhtml/chunk-common.xsl"/>
+<xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/xhtml/chunk-code.xsl"/>
+<xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/xhtml/manifest.xsl"/>
 
 <xsl:param name="html.stylesheet" select="'ardour_manual.css'"/>
 <xsl:param name="html.stylesheet.type" select="'text/css'"/>
diff --git a/templates/wscript b/templates/wscript
index 3f00b785ae..9e390434e6 100644
--- a/templates/wscript
+++ b/templates/wscript
@@ -21,6 +21,7 @@ def build(bld):
     templates = bld.path.ant_glob('*.template.in')
     for t in templates:
         obj = bld(features = 'subst')
+        obj.name = 'template'
         obj.source = [ t ]
         dir_name = os.path.basename(t.srcpath()).replace('.template.in', '')
         file_name = os.path.basename(t.srcpath()).replace('.in', '')
diff --git a/wscript b/wscript
index 561a2a4770..05620d375a 100644
--- a/wscript
+++ b/wscript
@@ -34,7 +34,8 @@ children = [
         'gtk2_ardour',
         'templates',
         'export',
-        'midi_maps'
+        'midi_maps',
+        'manual'
 ]
 
 i18n_children = [