diff --git a/lib/ChangeLog b/lib/ChangeLog
index 57fd64fdde..6604ec856b 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -6,7 +6,8 @@
 	* keychain.c: Convert some more strtoul users to VTY_GET_INTEGER.
 	* memory.h: Add MTYPE_THREAD_FUNCNAME and MTYPE_THREAD_STATS
 	* thread.c: Update stats and funcname alloc/free to use previous
-	  specific memory type defines
+	  specific memory type defines. Use XCALLOC and sizeof the type,
+          not the pointer.
 	* smux.c: fix int to size_t compile warnings
 
 2004-10-29 Paul Jakma <paul@dishone.st>
diff --git a/lib/thread.c b/lib/thread.c
index 94fdf1f52f..09d6ff7332 100644
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -104,8 +104,7 @@ static void*
 cpu_record_hash_alloc (struct cpu_thread_history *a)
 {
   struct cpu_thread_history *new;
-  new = XMALLOC( MTYPE_THREAD_STATS, sizeof *new);
-  memset(new, 0, sizeof (struct cpu_thread_history));
+  new = XCALLOC (MTYPE_THREAD_STATS, sizeof (struct cpu_thread_history));
   new->func = a->func;
   new->funcname = XSTRDUP(MTYPE_THREAD_FUNCNAME, a->funcname);
   return new;