diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index 888c295ea60..7c8f1af79c1 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -27,7 +27,8 @@ srcdir = @srcdir@
 VPATH=@srcdir@
 
 infodir = ../../info
-usermanualdir = $(srcdir)/../emacs
+# Directory with the (customized) texinfo.tex file.
+texinfodir = $(srcdir)/../misc
 
 TEXI2DVI = texi2dvi
 SHELL = /bin/sh
@@ -100,11 +101,11 @@ $(infodir)/elisp: $(srcs)
 	cd $(srcdir); $(MAKEINFO) -I. -I$(infodir) elisp.texi -o $(infodir)/elisp
 
 elisp.dvi: $(srcs)
-	$(TEXI2DVI) -I $(srcdir) -I $(usermanualdir) $(srcdir)/elisp.texi
+	$(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $(srcdir)/elisp.texi
 
 clean:
 	rm -f *.toc *.aux *.log *.cp *.cps *.fn *.fns *.tp *.tps \
-              *.vr *.vrs *.pg *.pgs *.ky *.kys
+              *.vr *.vrs *.pg *.pgs *.ky *.kys elisp[12]*
 	rm -f make.out core
 
 distclean: clean