diff --git a/vtysh/ChangeLog b/vtysh/ChangeLog
index ecf7c2f..d72c7a6 100644
--- a/vtysh/ChangeLog
+++ b/vtysh/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-07 Hasso Tepper <hasso at quagga.net>
+
+	* Makefile.am: Remove rebuild4 target, it's not used any more by build
+	  procedure. Define vtysh_cmd_FILES. Use EXTRA_DIST.
+
 2005-03-28 Hasso Tepper <hasso at quagga.net>
 
 	* extract.pl.in: Use SNMP_INCLUDES to avoid warnings if compiling with
diff --git a/vtysh/Makefile.am b/vtysh/Makefile.am
index 830ed80..35dc763 100644
--- a/vtysh/Makefile.am
+++ b/vtysh/Makefile.am
@@ -18,19 +18,18 @@
 
 EXTRA_DIST = extract.pl
 
-rebuild4:
-	./extract.pl $(top_srcdir)/zebra/*.c $(top_srcdir)/ripd/*.c $(top_srcdir)/ospfd/*.c $(top_srcdir)/bgpd/*.c $(top_srcdir)/isisd/*.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 > vtysh_cmd.c
+vtysh_cmd_FILES = $(top_srcdir)/bgpd/*.c $(top_srcdir)/isisd/*.c \
+		  $(top_srcdir)/ospfd/*.c $(top_srcdir)/ospf6d/*.c \
+		  $(top_srcdir)/ripd/*.c $(top_srcdir)/ripngd/*.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)/lib/vty.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 $(top_srcdir)/zebra/router-id.c
 
-vtysh_cmd.c: $(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)/lib/vty.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 $(top_srcdir)/zebra/router-id.c
-	./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)/lib/vty.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 $(top_srcdir)/zebra/router-id.c > vtysh_cmd.c
+vtysh_cmd.c: $(vtysh_cmd_FILES)
+	./$(EXTRA_DIST) $(vtysh_cmd_FILES) > vtysh_cmd.c