diff --git a/src/doc/manual/Makefile b/src/doc/manual/Makefile
index f82c28758c01bce4d7e3d26285fb068d859ac62e..cd280f49fe3708366f9849533ce551512c305071 100644
--- a/src/doc/manual/Makefile
+++ b/src/doc/manual/Makefile
@@ -1,25 +1,36 @@
 FILES= *.txi */*.txi figures/*
 
+MANNAME=ecl-manual
+HTMLDIR=$(MANNAME)
+PDFNAME=$(MANNAME).pdf
+# left this as "ecl" for historic reasons
+INFONAME=ecl.info
+
+CWD=$(shell pwd)
+
 .PHONY: all pdf info html
 
 all: pdf info html
 
-pdf: manual.pdf
+pdf: $(PDFNAME)
 info: ecl.info.gz
-html: html/index.html
+html: $(HTMLDIR)/index.html
 
-manual.pdf: $(FILES)
-	texi2pdf manual.txi
+ecl-manual.pdf: $(FILES)
+	PDFTEX=$(CWD)/z-texi2pdfetex-fix-aux texi2pdf manual.txi \
+	&& cp -pf manual.pdf $(PDFNAME)
 
 ecl.info.gz: $(FILES)
-	$(MAKEINFO) --no-split manual.txi
-	gzip < ecl.info > ecl.info.gz
+	$(MAKEINFO) -o $(INFONAME) --no-split manual.txi
+	gzip < $(INFONAME) > $(INFONAME).gz
 
-html/index.html: $(FILES)
-	$(MAKEINFO) --html --css-include=ecl.css --split=section manual.txi
-	rm -rf html
-	mv ecl html
-	cp -r figures html
+$(HTMLDIR)/index.html: $(FILES)
+	-rm -rf $(HTMLDIR)/
+	$(MAKEINFO) -o $(HTMLDIR) --html --css-include=ecl.css --split=section manual.txi
+	cp -r figures $(HTMLDIR)/
 
 clean:
-	rm -rf *.{aux,cf,cfs,cp,cpp,cpps,cps,ex,exs,fn,fns,ft,fts,log,lsp,lsps,toc,tp,tps,vr,vrs,pdf,info,info-1,info-2,info.gz,html} html
+	-rm -rf *.{aux,cf,cfs,cp,cpp,cpps,cps,ex,exs,fn,fns,ft,fts,log,lsp,lsps,toc,tp,tps,vr,vrs,pdf,info,info-1,info-2,info.gz,html} html/ \
+		manual.[ceflvpa]* manual.toc manual.tp manual.tps \
+		$(PDFNAME) $(HTMLDIR)/ \
+		$(INFONAME) $(INFONAME).gz
diff --git a/src/doc/manual/macros.txi b/src/doc/manual/macros.txi
index f7e6e580b6933b76f5195194575a3dcfa75a04c0..57f8110a6430316bd8fac55b3783eb0159a3cd37 100644
--- a/src/doc/manual/macros.txi
+++ b/src/doc/manual/macros.txi
@@ -132,7 +132,7 @@
 @inlinefmtifelse{html, @code{@ref{\code\}}, @code{\code\}}
 @end macro
 
-@macro seealso{node}
+@macro noseealso{node}
 @paragraph{See also}
 @coderef{\node\}
 @end macro
diff --git a/src/doc/manual/manual.txi b/src/doc/manual/manual.txi
index a11a9190be294a98b20081055fd5caaefc8127ab..7107e9f2b6629c015fba5c3ec7613286fc6b42ed 100644
--- a/src/doc/manual/manual.txi
+++ b/src/doc/manual/manual.txi
@@ -26,9 +26,9 @@
 
 @noindent
 Copyright @copyright{} 2015, Daniel Kochmański
-@noindent
+@c @noindent	@c noindent here causes warnings
 Copyright @copyright{} 2000, Juan Jose Garcia-Ripoll
-@noindent
+@c @noindent	@c noindent here causes warnings
 Copyright @copyright{} 1990, Giuseppe Attardi
 @end ifinfo
 
diff --git a/src/doc/manual/standards/characters.txi b/src/doc/manual/standards/characters.txi
index e3e4983728d8d9dfb35fcd031452ea3b704255ec..f5d6c435283366b69f1d5a8ed83caa5e05973a12 100644
--- a/src/doc/manual/standards/characters.txi
+++ b/src/doc/manual/standards/characters.txi
@@ -4,12 +4,12 @@
 ECL is fully ANSI Common-Lisp compliant in all aspects of the character data type, with the following peculiarities.
 
 @menu
-* Characters - Unicode vs. POSIX locale::
+* Characters - Unicode vs POSIX locale::
 * Characters - Newline characters::
 * Characters - C Reference::
 @end menu
 
-@node Characters - Unicode vs. POSIX locale
+@node Characters - Unicode vs POSIX locale
 @subsection Unicode vs. POSIX locale
 @cfindex --enable-unicode [32|16|no]
 
diff --git a/src/doc/manual/user-guide/embedding.txi b/src/doc/manual/user-guide/embedding.txi
index 8ce25c2d4ecb8eab6a5f346f56c0f3606edd0973..53609377e209dd8ea754d82df47734d3338ccf4c 100644
--- a/src/doc/manual/user-guide/embedding.txi
+++ b/src/doc/manual/user-guide/embedding.txi
@@ -215,7 +215,7 @@ When embedding ECL it is normally advisable to set up an @code{unwind-protect} f
 
 Besides this, normal mechanisms for exit, such as @coderef{ext:quit}, and uncaught exceptions, such as serious signals (@xref{Signals and Interrupts - Synchronous signals}), are best handled using @code{unwind-protect} blocks.
 
-@seealso ECL_CATCH_ALL
+@seealso{ECL_CATCH_ALL}
 @end defmac
 
 @cppdef ecl_clear_interrupts
diff --git a/src/doc/manual/z-texi2pdfetex-fix-aux b/src/doc/manual/z-texi2pdfetex-fix-aux
new file mode 100755
index 0000000000000000000000000000000000000000..eda7463218fcf71af4b930e7c01626a4cdb8be31
--- /dev/null
+++ b/src/doc/manual/z-texi2pdfetex-fix-aux
@@ -0,0 +1,19 @@
+#! /bin/sh -
+
+for f in x *.aux ; do
+	if [ -f $f ] ; then
+		sed -e 's/@unhbox @voidb@x @kern .07em @vbox {@hrule width.3em height.1ex}@kern .07em//' \
+		< ${f} > temp
+		mv temp $f
+	fi
+done
+
+pdfetex $*
+
+for f in x *.aux ; do
+	if [ -f $f ] ; then
+		sed -e 's/@unhbox @voidb@x @kern .07em @vbox {@hrule width.3em height.1ex}@kern .07em//' \
+		< ${f} > temp
+		mv temp $f
+	fi
+done