diff --git a/vtysh/ChangeLog b/vtysh/ChangeLog
index 8e6684d..54960e1 100644
--- a/vtysh/ChangeLog
+++ b/vtysh/ChangeLog
@@ -1,8 +1,10 @@
 2004-09-13 Paul Jakma <paul@dishone.st>
 
 	* Makefile.am: extract.pl isnt in srcdir, it's always in the builddir.
+	  remove zebra/irdp.c from list - dead.
 	* extract.pl.in: match on end of filenames, filename could contain
-          various preamble due to out of tree builds.
+          various preamble due to out of tree builds. Substitute in the
+	  autoconf srcdir/builddir paths for includes to cpp.
 
 2004-08-28 Hasso Tepper <hasso at quagga.net>
 
diff --git a/vtysh/Makefile.am b/vtysh/Makefile.am
index c1c650b..1ac5ee4 100644
--- a/vtysh/Makefile.am
+++ b/vtysh/Makefile.am
@@ -30,7 +30,7 @@
 	./extract.pl $(top_srcdir)/ripd/*.c $(top_srcdir)/ripngd/*.c $(top_srcdir)/ospfd/*.c $(top_srcdir)/ospf6d/*.c \
 	  $(top_srcdir)/isisd/*.c $(top_srcdir)/bgpd/*.c $(top_srcdir)/lib/keychain.c $(top_srcdir)/lib/routemap.c \
 	  $(top_srcdir)/lib/filter.c $(top_srcdir)/lib/plist.c $(top_srcdir)/lib/distribute.c $(top_srcdir)/lib/if_rmap.c \
-	  $(top_srcdir)/zebra/debug.c $(top_srcdir)/zebra/interface.c $(top_srcdir)/zebra/irdp.c \
+	  $(top_srcdir)/zebra/debug.c $(top_srcdir)/zebra/interface.c  \
 	  $(top_srcdir)/zebra/irdp_interface.c $(top_srcdir)/zebra/rtadv.c $(top_srcdir)/zebra/zebra_vty.c \
 	  $(top_srcdir)/zebra/zserv.c > vtysh_cmd.c
 
diff --git a/vtysh/extract.pl.in b/vtysh/extract.pl.in
index ae83a2e..053b17e 100755
--- a/vtysh/extract.pl.in
+++ b/vtysh/extract.pl.in
@@ -1,5 +1,7 @@
 #! @PERL@
 ##
+## @configure_input@
+##
 ## Virtual terminal interface shell command extractor.
 ## Copyright (C) 2000 Kunihiro Ishiguro
 ## 
@@ -54,7 +56,7 @@
 foreach (@ARGV) {
     $file = $_;
 
-    open (FH, "cpp -DHAVE_CONFIG_H -DVTYSH_EXTRACT_PL -DHAVE_IPV6 -I. -I.. -I../lib $file |");
+    open (FH, "cpp -DHAVE_CONFIG_H -DVTYSH_EXTRACT_PL -DHAVE_IPV6 -I@top_builddir@ -I@srcdir@/ -I@srcdir@/.. -I@top_srcdir@/lib $file |");
     local $/; undef $/;
     $line = <FH>;
     close (FH);