diff --git a/isisd/ChangeLog b/isisd/ChangeLog
index 3bc94cc..38ab2fc 100644
--- a/isisd/ChangeLog
+++ b/isisd/ChangeLog
@@ -1,3 +1,13 @@
+2005-04-10 Paul Jakma <paul@dishone.st>
+
+	* Makefile.am: topology should not be a conditional SUBDIR,
+	  otherwise make dist breaks.
+	* topology/Makefile.am: remove EXTRA_DIST of files which dont
+	  exist in that directory, broke make dist.
+	* isisd.c: (show_isis_generated_topology_cmd) convert LIST_LOOP
+	* isis_lsp.c: (generate_topology_lsps) ditto
+	  (build_topology_lsp_data) ditto
+
 2005-04-02 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
 	* isis_zebra.c: (isis_zebra_if_del) Must use if_lookup_by_name_len.
diff --git a/isisd/Makefile.am b/isisd/Makefile.am
index ceb948c..1dd5493 100644
--- a/isisd/Makefile.am
+++ b/isisd/Makefile.am
@@ -7,7 +7,7 @@
 LIBS = @LIBS@ 
 noinst_LIBRARIES = libisis.a
 sbin_PROGRAMS = isisd 
-SUBDIRS = @ISIS_TOPOLOGY_DIR@
+SUBDIRS = topology
 
 libisis_a_SOURCES = \
 	isis_adjacency.c isis_lsp.c dict.c isis_circuit.c isis_pdu.c \
diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
index 88d4886..f59e804 100644
--- a/isisd/isis_lsp.c
+++ b/isisd/isis_lsp.c
@@ -2295,7 +2295,7 @@
   struct isis_lsp *lsp;
 
   /* first we find the maximal node */
-  LIST_LOOP (area->topology, arc, node)
+  for (ALL_LIST_ELEMENTS_RO (area->topology, node, arc))
   {
     if (arc->from_node > max)
       max = arc->from_node;
@@ -2355,7 +2355,7 @@
 build_topology_lsp_data (struct isis_lsp *lsp, struct isis_area *area,
 			 int lsp_top_num)
 {
-  struct listnode *node;
+  struct listnode *node, *nnode;
   struct arc *arc;
   u_char *tlv_ptr;
   struct is_neigh *is_neigh;
@@ -2399,7 +2399,7 @@
     }
 
   /* addding is reachabilities */
-  LIST_LOOP (area->topology, arc, node)
+  for (ALL_LIST_ELEMENTS (area->topology, node, nnode, arc))
   {
     if ((arc->from_node == lsp_top_num) || (arc->to_node == lsp_top_num))
       {
diff --git a/isisd/isisd.c b/isisd/isisd.c
index c2bb906..aeebee6 100644
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -1602,7 +1602,7 @@
       {
 	vty_out (vty, "Topology for isis area:%s%s", area->area_tag,
 		 VTY_NEWLINE);
-	LIST_LOOP (area->topology, arc, node2)
+	for (ALL_LIST_ELEMENTS (area->topology, node2, arc))
 	{
 	  vty_out (vty, "a  %ld   %ld   %ld%s", arc->from_node, arc->to_node,
 		   arc->distance, VTY_NEWLINE);
diff --git a/isisd/topology/Makefile.am b/isisd/topology/Makefile.am
index ae6fa82..4420521 100644
--- a/isisd/topology/Makefile.am
+++ b/isisd/topology/Makefile.am
@@ -15,8 +15,6 @@
 noinst_HEADERS = \
 	spgrid.h
 
-EXTRA_DIST = regex.c regex-gnu.h
-
 depend:
 	@$(CPP) -MM $(INCLUDES) $(LDFLAGS) *.c