diff --git a/doc/ChangeLog b/doc/ChangeLog
index 13441706..353089a3 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-22  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* texi2pod.pl: Locate perl using the "env" program, so we don't
+	need to modify texi2pod.
+
+	* Makefile.in (wget.pod): Work with texi2pod.pl directly instead
+	of generating it from texi2pod.pl.in.
+
 2005-06-22  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* wget.texi (Wgetrc Commands): Remove the "lockable boolean"
diff --git a/doc/Makefile.in b/doc/Makefile.in
index d6db64a6..103bba50 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
@@ -68,12 +68,8 @@ $(SAMPLERCTEXI): $(srcdir)/sample.wgetrc
 wget.info: $(srcdir)/wget.texi $(SAMPLERCTEXI) $(srcdir)/version.texi
 	$(MAKEINFO) -I$(srcdir) $(srcdir)/wget.texi
 
-$(TEXI2POD): $(srcdir)/$(TEXI2POD).in
-	sed 's,^#! /usr/bin/perl,#! @PERL@,' $? > $@
-	chmod u+x $@
-
-wget.pod: $(srcdir)/wget.texi $(TEXI2POD) $(srcdir)/version.texi
-	./$(TEXI2POD) $(srcdir)/wget.texi $@
+wget.pod: $(srcdir)/wget.texi $(srcdir)/version.texi
+	$(TEXI2POD) $(srcdir)/wget.texi $@
 
 $(MAN): wget.pod
 	$(POD2MAN) --center="GNU Wget" --release="GNU Wget @VERSION@" $? > $@
@@ -166,7 +162,7 @@ clean:
 
 distclean: clean
 	$(RM) Makefile
-	$(RM) $(MAN) $(TEXI2POD)
+	$(RM) $(MAN)
 
 realclean: distclean
 	$(RM) wget.info*
diff --git a/doc/texi2pod.pl.in b/doc/texi2pod.pl
old mode 100644
new mode 100755
similarity index 99%
rename from doc/texi2pod.pl.in
rename to doc/texi2pod.pl
index d2ed22ef..05d7d4be
--- a/doc/texi2pod.pl.in
+++ b/doc/texi2pod.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl -w
+#! /usr/bin/env perl
 
 #   Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
 
@@ -23,6 +23,8 @@
 # markup to Perl POD format.  It's intended to be used to extract
 # something suitable for a manpage from a Texinfo document.
 
+use warnings;
+
 $output = 0;
 $skipping = 0;
 %sects = ();