diff --git a/SConstruct b/SConstruct
index a12f930f2b..c71681f05c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1082,7 +1082,8 @@ if env['SYSLIBS']:
                                             CPPPATH='#libs/appleutility')
     
     coredirs = [
-        'templates'
+        'templates',
+        'manual'
     ]
     
     subdirs = [
@@ -1147,7 +1148,8 @@ else:
                                             CPPPATH='#libs/appleutility')
 
     coredirs = [
-        'templates'
+        'templates',
+	'manual'
     ]
     
     subdirs = [
diff --git a/manual/SConscript b/manual/SConscript
new file mode 100644
index 0000000000..f8a5a12be1
--- /dev/null
+++ b/manual/SConscript
@@ -0,0 +1,11 @@
+# -*- python -*-
+
+Import('env ardour_version')
+
+manual_subst_dict = { }
+
+manual_subst_dict['%VERSION%'] = ardour_version
+
+entities = env.SubstInFile ('xml/entities.ent', 'xml/entities.ent.in', SUBST_DICT = manual_subst_dict);
+
+Default(entities)
diff --git a/manual/xml/book_info.xml b/manual/xml/book_info.xml
index 06e4cbfb05..061e2f0133 100644
--- a/manual/xml/book_info.xml
+++ b/manual/xml/book_info.xml
@@ -10,13 +10,13 @@
 <bookinfo>
   <title>Ardour Manual</title>
   <issuenum>1.0</issuenum>
-  <productnumber>2.0</productnumber>
+  <productnumber>&ARDOUR_VERSION;</productnumber>
   <abstract>
     <para>
-      This is the manual for &ARDOUR_NAME;, a digital audio workstation for
-      Linux and MacOSX. This manual is jointly created and edited by the
-      &ARDOUR_NAME; community. It may be published in paper format at some
-      time in the future.
+      This is the manual for &ARDOUR_NAME; version &ARDOUR_VERSION;, a
+      digital audio workstation for Linux and MacOSX. This manual is jointly
+      created and edited by the &ARDOUR_NAME; community. It may be published
+      in paper format at some time in the future.
     </para>
   </abstract>
   <isbn>
diff --git a/manual/xml/entities.ent b/manual/xml/entities.ent
index 0279d776b5..c427969ae6 100644
--- a/manual/xml/entities.ent
+++ b/manual/xml/entities.ent
@@ -5,7 +5,7 @@
 <!ENTITY BOOKID "&BOOKNAME;-&BOOKVERSION; (&BOOKDATE;)">
 
 <!ENTITY ARDOUR_NAME "ardour">
-<!ENTITY ARDOUR_VERSION "2.0">
+<!ENTITY ARDOUR_VERSION "2.4.1">
 <!ENTITY ARDOUR_COMMAND "<command>ardour-&ARDOUR_VERSION;</command>">
 <!ENTITY ARDOUR_APPLICATION "<application>&ARDOUR_NAME;</application>">
 <!ENTITY COPYRIGHT_HOLDER "&ARDOUR_NAME; Foundation">
diff --git a/manual/xml/entities.ent.in b/manual/xml/entities.ent.in
new file mode 100644
index 0000000000..c8f8fe7a44
--- /dev/null
+++ b/manual/xml/entities.ent.in
@@ -0,0 +1,22 @@
+<!ENTITY YEAR "2007">
+<!ENTITY BOOKNAME "Ardour Reference Guide">
+<!ENTITY BOOKVERSION "0.01"> <!-- change version here -->
+<!ENTITY BOOKDATE "2007-01-13"> <!-- change revision date here -->
+<!ENTITY BOOKID "&BOOKNAME;-&BOOKVERSION; (&BOOKDATE;)">
+
+<!ENTITY ARDOUR_NAME "ardour">
+<!ENTITY ARDOUR_VERSION "%VERSION%">
+<!ENTITY ARDOUR_COMMAND "<command>ardour-&ARDOUR_VERSION;</command>">
+<!ENTITY ARDOUR_APPLICATION "<application>&ARDOUR_NAME;</application>">
+<!ENTITY COPYRIGHT_HOLDER "&ARDOUR_NAME; Foundation">
+
+<!ENTITY MIX_WIN '<link linkend="sn-mixer-window">Mixer Window</link>'>
+<!ENTITY EDIT_WIN '<link linkend="sn-editor-window">Editor Window</link>'>
+
+<!ENTITY MIXER_STRIP '<link linkend="sn-mixer-strips">Mixer Strip</link>'>
+<!ENTITY MIXER_STRIP_LIST '<link linkend="sn-mixer-strip-list">Mixer Strip List</link>'>
+
+<!ENTITY TRACK_DISPLAY '<link linkend="sn-track-display">Track Display</link>'>
+<!ENTITY TRACK_CONTROLS '<link linkend="sn-track-controls">Track Controls</link>'>
+
+<!ENTITY PLAYLIST '<glossterm linkend="gt-playlist">Playlist</glossterm>'>