diff --git a/.gitignore b/.gitignore
index bb3f8f2381fc6c971baf1a7b76d46068d232fcd8..b17f0de93af5982c2ecd4cd9c3e77fc3838ca76b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ doc/asdf.vr
 doc/asdf.vrs
 doc/asdf.t2d/
 doc/asdf.dvi
+doc/version.texinfo
 *.tmp
 
 LICENSE
diff --git a/doc/Makefile b/doc/Makefile
index 7e23982a7b08613ced65a37b51fa811098164153..632804cffaf2c11fbb61351a4b2ce8c132254e55 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -12,16 +12,19 @@ intermediate = asdf.cps asdf.log asdf.vr asdf.aux asdf.fn asdf.toc asdf.vrs \
 
 all:	asdf.html asdf.info asdf.pdf manual-html
 
-manual-html: asdf.texinfo
+version.texinfo: ../version.lisp-expr
+	head -n 1 $^ | perl -ne 'm|\"(.*)\"|; print "\@set VERSION $$1\n"' > $@
+
+manual-html: asdf.texinfo version.texinfo
 	makeinfo --html asdf.texinfo
 
-asdf.html: asdf.texinfo
+asdf.html: asdf.texinfo version.texinfo
 	makeinfo --html --no-split --no-headers -o asdf.html asdf.texinfo
 
-asdf.info: asdf.texinfo
+asdf.info: asdf.texinfo version.texinfo
 	makeinfo asdf.texinfo
 
-asdf.pdf: asdf.texinfo
+asdf.pdf: asdf.texinfo version.texinfo
 	texi2pdf asdf.texinfo
 
 website: all
diff --git a/doc/asdf.texinfo b/doc/asdf.texinfo
index 5af04230c2d612eb118f1b9c40a0ec649e36420d..0467a332374de065a5b33ce07dd5c436f426e4de 100644
--- a/doc/asdf.texinfo
+++ b/doc/asdf.texinfo
@@ -63,11 +63,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 @end copying
 
-
+@include version.texinfo
 
 @titlepage
 @title ASDF: Another System Definition Facility
-
+@subtitle Manual for Version @value{VERSION}
 @c The following two commands start the copyright page.
 @page
 @vskip 0pt plus 1filll
@@ -83,6 +83,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 @node Top, Introduction, (dir), (dir)
 @top ASDF: Another System Definition Facility
+@ifnottex
+Manual for Version @value{VERSION}
+@end ifnottex
+
 
 @insertcopying