diff --git a/Documentation/user/lilypond-learning.tely b/Documentation/user/lilypond-learning.tely
index c1e8119..ca8f2b0 100644
--- a/Documentation/user/lilypond-learning.tely
+++ b/Documentation/user/lilypond-learning.tely
@@ -10,6 +10,8 @@
 @documentencoding UTF-8
 @documentlanguage en
 
+@include macros.itexi
+
 @iftex
 @afourpaper
 @c don't replace quotes with directed quotes
@@ -64,21 +66,7 @@ Free Documentation License''.
 
 @vskip 20pt
 
-@lilypond[ragged-right]
-\score {
-  \context Lyrics {
-    \override Score.RehearsalMark #'self-alignment-X = #LEFT
-    \override Score.RehearsalMark #'font-size = #-2
-    \mark #(ly:export (string-append
-      "(For LilyPond version " (lilypond-version) ")"))
-    s2
-  }
-  \layout {
-    indent = 0.0\pt
-  }
-}
-@end lilypond
-
+For LilyPond version @version{}
 @end titlepage
 
 @copying
@@ -112,12 +100,8 @@ Free Documentation License''.
 @ifnottex
 @node Top
 @top GNU LilyPond --- learning manual
-@c HJJ: Info needs `@top', which is a synonym for `@unnumbered' in TeX.
 
-This is the learning manual for GNU LilyPond 2.11.x series.
-@ifhtml
-(See the bottom of this page for the exact version number).
-@end ifhtml
+This is the learning manual for GNU LilyPond version @version{}.
 
 @cindex web site
 @cindex URL
@@ -147,8 +131,6 @@ Appendices
 @contents
 
 
-@include macros.itexi
-
 @include preface.itely
 @include introduction.itely
 @include tutorial.itely
diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index b0dafef..a49a06d 100644
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -7,8 +7,8 @@
 @end ignore
 
 @macro version
-@c @value{version}
-2.11.41
+@value{version}
+@c 2.11.41
 @end macro
 
 @c   ***** Displaying text *****
diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
index d36ff83..b9642e8 100644
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -7,11 +7,12 @@ TEXINFO_SOURCES = $(TEXI_FILES)
 
 OUTTXT_FILES += $(addprefix $(outdir)/,$(TEXI_FILES:.texi=.txt))
 
+TEXI2PDF_FLAGS += --command '@set version $(TOPLEVEL_VERSION)'
 GENERATE_OMF = $(PYTHON) $(buildscript-dir)/texi2omf.py --format $(1) --location $(webdir)/$(tree-dir)/out-www/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
 
 TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)
 
-MAKEINFO_FLAGS = --enable-encoding
+MAKEINFO_FLAGS = --enable-encoding -D 'version $(TOPLEVEL_VERSION)'
 MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)