diff --git a/lib/ChangeLog b/lib/ChangeLog
index 3b619d8..61b3764 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -2,6 +2,8 @@
 
 	* Makefile.am: Refer to source files via srcdir variable, fix
 	  out-of-tree build breakage.
+	* memory.c: Make the string field much wider
+	* memtypes.c: Correct the prefix list str/entry strings
 
 2005-04-22 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
diff --git a/lib/memory.c b/lib/memory.c
index 335a921..adf23b1 100644
--- a/lib/memory.c
+++ b/lib/memory.c
@@ -264,7 +264,7 @@
     if (m->index == 0)
       vty_out (vty, "-----------------------------\r\n");
     else
-      vty_out (vty, "%-22s: %10ld\r\n", m->format, mstat[m->index].alloc);
+      vty_out (vty, "%-30s: %10ld\r\n", m->format, mstat[m->index].alloc);
 }
 
 DEFUN (show_memory_all,
diff --git a/lib/memtypes.c b/lib/memtypes.c
index 6ee75a5..7caa42a 100644
--- a/lib/memtypes.c
+++ b/lib/memtypes.c
@@ -6,7 +6,7 @@
  * The script is sensitive to the format (though not whitespace), see
  * the top of memtypes.awk for more details.
  *
- * $Id: memtypes.c,v 1.2 2005/04/16 15:51:05 paul Exp $
+ * $Id: memtypes.c,v 1.3 2005/04/25 14:02:44 paul Exp $
  */
 
 #include "zebra.h"
@@ -48,8 +48,8 @@
   { MTYPE_ACCESS_LIST_STR,	"Access List Str"		},
   { MTYPE_ACCESS_FILTER,	"Access Filter"			},
   { MTYPE_PREFIX_LIST,		"Prefix List"			},
-  { MTYPE_PREFIX_LIST_ENTRY,	"Prefix List Str"		},
-  { MTYPE_PREFIX_LIST_STR,	"Prefix List Entry"		},
+  { MTYPE_PREFIX_LIST_ENTRY,	"Prefix List Entry"		},
+  { MTYPE_PREFIX_LIST_STR,	"Prefix List Str"		},
   { MTYPE_ROUTE_MAP,		"Route map"			},
   { MTYPE_ROUTE_MAP_NAME,	"Route map name"		},
   { MTYPE_ROUTE_MAP_INDEX,	"Route map index"		},