diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0336a200..636643a9 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-16  Peter Farmer  <peter.farmer@zveno.com>
+
+	* Makefile.in: Use $? instead of $<.  Use TEXI2POD more
+	consistently.
+
 2001-06-16  Hrvoje Niksic  <hniksic@arsdigita.com>
 
 	* wget.texi: Updated version to 1.7.1.
diff --git a/doc/Makefile.in b/doc/Makefile.in
index b29b3351..c5ef93bc 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -48,7 +48,7 @@ INSTALL      = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 RM = rm -f
 
-TEXI2POD     = ./texi2pod.pl
+TEXI2POD     = $(srcdir)/texi2pod.pl
 POD2MAN      = @POD2MAN@
 MAN          = wget.$(manext)
 WGETRC       = $(sysconfdir)/wgetrc
@@ -63,23 +63,23 @@ all: wget.info @COMMENT_IF_NO_POD2MAN@$(MAN)
 everything: all wget_us.ps wget_a4.ps wget_toc.html
 
 $(SAMPLERCTEXI): $(srcdir)/sample.wgetrc
-	sed s/@/@@/g $< > $@
+	sed s/@/@@/g $? > $@
 
 wget.info: $(SAMPLERCTEXI) $(srcdir)/wget.texi
 	$(MAKEINFO) -I$(srcdir)
 
-$(TEXI2POD): $(srcdir)/$(TEXI2POD).in
-	sed s,/usr/bin/perl,@PERL@, $< > $@
+$(TEXI2POD): $(TEXI2POD).in
+	sed s,/usr/bin/perl,@PERL@, $? > $@
 	chmod u+x $@
 
-wget.pod: $(srcdir)/wget.texi texi2pod.pl
-	$(TEXI2POD) $< $@
+wget.pod: $(srcdir)/wget.texi $(TEXI2POD)
+	$(TEXI2POD) $(srcdir)/wget.texi $@
 
 $(MAN): wget.pod
-	$(POD2MAN) --center="GNU Wget" --release="GNU Wget @VERSION@" $< > $@
+	$(POD2MAN) --center="GNU Wget" --release="GNU Wget @VERSION@" $? > $@
 
 #wget.cat: $(MAN)
-#	nroff -man $< > $@
+#	nroff -man $? > $@
 
 dvi: wget.dvi