diff --git a/doc/Makefile.in b/doc/Makefile.in
index e7cd2d56..0ac43807 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -28,17 +28,26 @@ all: $(OUT)
 
 os2: nasm.inf
 
-.SUFFIXES: .src .texi .info .ps .rtf .hpj .dvi .pdf .txt .pl .ipf .inf
-
 # Consider html, txt and ps output a side effect
-nasmdoc.texi: nasmdoc.src rdsrc.pl
+nasmdoc.dip: nasmdoc.src rdsrc.pl
 	mkdir -p html
 	$(PERL) $(srcdir)/rdsrc.pl < $<
 	mv -f *.html html
 
-nasmdoc.ps: nasmdoc.texi
+nasmdoc.ps: nasmdoc.dip
 	: Generated by side effect
 
+nasmdoc.texi: nasmdoc.dip
+	: Generated by side effect
+
+new: nasmdocx.ps nasmdocx.pdf
+
+nasmdocx.ps: nasmdoc.dip nasmlogo.eps genps.pl psfonts.ph pswidth.pl head.ps
+	$(PERL) $(srcdir)/genps.pl > nasmdocx.ps
+
+nasmdocx.pdf: nasmdocx.ps
+	$(PS2PDF) nasmdocx.ps nasmdocx.pdf
+
 nasm.info: info/nasm.info
 
 info/nasm.info: nasmdoc.texi
@@ -66,7 +75,9 @@ clean:
 	-rm -f *.aux *.cp *.fn *.ky *.pg *.log *.toc *.tp *.vr
 
 spotless: clean
-	-rm -rf html info *.hlp *.txt *.ps *.inf *.pdf *.dvi
+	-rm -rf html info
+	-rm -f *.hlp *.txt *.inf *.pdf *.dvi
+	-rm -f nasmdoc.ps nasmdocx.ps
 
 install: all
 	$(INSTALL_DATA) info/* $(INSTALLROOT)$(infodir)