diff --git a/Makefile.am b/Makefile.am
index cc3ccb324c0390c94547f21cd3e5254a993a8846..feb2dc51726c79590f1617500d86077d5b283919 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,6 @@ RUN_IN_TEMPDIR = $(top_srcdir)/autotools/run-in-tempdir
 CHECK_PYTHON_CODE = $(top_srcdir)/autotools/check-python-code
 CHECK_MAN = $(top_srcdir)/autotools/check-man
 REPLACE_VARS_SED = autotools/replace_vars.sed
-REPLACE_VARS_MAN = autotools/replace_vars.man
 
 hypervisordir = $(pkgpythondir)/hypervisor
 httpdir = $(pkgpythondir)/http
@@ -58,8 +57,7 @@ maintainer-clean-local:
 	rm -rf doc/api doc/html
 
 CLEANFILES = \
-	$(REPLACE_VARS_SED) \
-	$(REPLACE_VARS_MAN) \
+	autotools/replace_vars.sed \
 	daemons/daemon-util \
 	daemons/ganeti-cleaner \
 	devel/upload \
@@ -404,12 +402,12 @@ man/%.html.in: man/%.sgml man/footer.sgml $(DOCBOOK_WRAPPER)
 	  { echo 'docbook2html' not found during configure; exit 1; }
 	$(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $(notdir $(@:.in=)) $@
 
-man/%.7: man/%.7.in $(REPLACE_VARS_MAN)
-	sed -f $(REPLACE_VARS_MAN) < $< > $@
+man/%.7: man/%.7.in $(REPLACE_VARS_SED)
+	sed -f $(REPLACE_VARS_SED) < $< > $@
 	$(CHECK_MAN) $@
 
-man/%.8: man/%.8.in $(REPLACE_VARS_MAN)
-	sed -f $(REPLACE_VARS_MAN) < $< > $@
+man/%.8: man/%.8.in $(REPLACE_VARS_SED)
+	sed -f $(REPLACE_VARS_SED) < $< > $@
 	$(CHECK_MAN) $@
 
 man/%.html: man/%.html.in $(REPLACE_VARS_SED)
@@ -474,9 +472,6 @@ $(REPLACE_VARS_SED): Makefile
 	  echo 's#@PKGLIBDIR@#$(pkglibdir)#g'; \
 	} > $@
 
-$(REPLACE_VARS_MAN): $(REPLACE_VARS_SED)
-	sed -e 's^/^\0\\\\:^g' < $^ >$@
-
 # We need to create symlinks because "make distcheck" will not install Python
 # files when building.
 stamp-srclinks: Makefile stamp-directories
diff --git a/man/ganeti-cleaner.sgml b/man/ganeti-cleaner.sgml
index e2bd9035b0f0f4bf1c2636920088168a7eba6b0a..ac60bdaf620125f3ed79fb89970f240c12e4f2dc 100644
--- a/man/ganeti-cleaner.sgml
+++ b/man/ganeti-cleaner.sgml
@@ -49,12 +49,11 @@
     </para>
 
     <para>
-      <command>&dhpackage;</command> automatically removes all files
-      older than 21 days from the archive located at:
+      <command>&dhpackage;</command> automatically removes all files older than
+      21 days from
+      <filename>@LOCALSTATEDIR@/lib/ganeti/queue/archive</filename>.
     </para>
 
-    <literallayout>@LOCALSTATEDIR@/lib/ganeti/queue/archive</literallayout>
-
   </refsect1>
 
   &footer;
diff --git a/man/ganeti-watcher.sgml b/man/ganeti-watcher.sgml
index 96a4fa449c01af06ce65f7c03ae68df7a705c7fa..b6e94658574d7ca12629fc592cdf790839c3da25 100644
--- a/man/ganeti-watcher.sgml
+++ b/man/ganeti-watcher.sgml
@@ -66,21 +66,17 @@
     <para>
       The watcher does synchronous queries but will submit jobs for
       executing the changes. Due to locking, it could be that the jobs
-      execute much later than the watcher schedules them.
+      execute much later than the watcher executes them.
     </para>
 
-    <para>The command has a state file located at</para>
-
-    <literallayout>@LOCALSTATEDIR@/lib/ganeti/watcher.data</literallayout>
-
-    <para>and a log file at</para>
-
-    <literallayout>@LOCALSTATEDIR@/log/ganeti/watcher.log</literallayout>
-
     <para>
-      Removal of either file will not affect correct operation; the
-      removal of the state file will just cause the restart counters
-      for the instances to reset to zero.
+      The command has a state file located at
+      <filename>@LOCALSTATEDIR@/lib/ganeti/watcher.data</filename> and a log
+      file at
+      <filename>@LOCALSTATEDIR@/log/ganeti/watcher.log</filename>. Removal of
+      either file will not affect correct operation; the removal of
+      the state file will just cause the restart counters for the
+      instances to reset to zero.
     </para>
 
   </refsect1>