diff --git a/lib/ChangeLog b/lib/ChangeLog
index 19fb03f..f2969e9 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,10 @@
 2004-11-26 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
+	* debug.[ch]: Remove unused files.
+	* Makefile.am: Remove references to debug.c and debug.h
+
+2004-11-26 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
 	* log.c: (zlog_backtrace) New function to log a backtrace.
 	  (zlog_backtrace_safe) Log a backtrace in an async-signal-safe way.
 	  Unfortunately, this function does not support syslog logging yet.
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 78bce16..4709b34 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -12,7 +12,7 @@
 	sockunion.c prefix.c thread.c if.c memory.c buffer.c table.c hash.c \
 	filter.c routemap.c distribute.c stream.c str.c log.c plist.c \
 	zclient.c sockopt.c smux.c md5.c if_rmap.c keychain.c privs.c \
-	debug.c sigevent.c pqueue.c jhash.c
+	sigevent.c pqueue.c jhash.c
 
 libzebra_la_DEPENDENCIES = @LIB_REGEX@
 
@@ -23,7 +23,7 @@
 	memory.h network.h prefix.h routemap.h distribute.h sockunion.h \
 	str.h stream.h table.h thread.h vector.h version.h vty.h zebra.h \
 	plist.h zclient.h sockopt.h smux.h md5-gnu.h if_rmap.h keychain.h \
-	privs.h debug.h sigevent.h pqueue.h jhash.h zassert.h
+	privs.h sigevent.h pqueue.h jhash.h zassert.h
 
 EXTRA_DIST = regex.c regex-gnu.h
 
diff --git a/lib/debug.c b/lib/debug.c
deleted file mode 100644
index 252e4dd..0000000
--- a/lib/debug.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <zebra.h>
-#include "log.h"
-
-void 
-debug_print_trace (int signal)
-{
-#ifdef HAVE_GLIBC_BACKTRACE
-    void *array[10];
-    size_t size;
-    char **strings;   
-    size_t i;
-
-    size = backtrace (array, 10);
-    strings = backtrace_symbols (array, size);
-
-    printf ("Obtained %zd stack frames.\n", size);
-
-    for (i = 0; i < size; i++)
-      printf ("%s\n", strings[i]);
-
-    free (strings);
-#endif /* HAVE_GLIBC_BACKTRACE */
-    
-    exit(1);
-}
diff --git a/lib/debug.h b/lib/debug.h
deleted file mode 100644
index 4440904..0000000
--- a/lib/debug.h
+++ /dev/null
@@ -1,3 +0,0 @@
-
-void debug_print_trace (int);
-
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 40e5491..2906abe 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-26 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+	* ospf_main.c: Remove #include "debug.h" (was not being used, and
+	  lib/debug.h has now been deleted).
+
 2004-11-25 Hasso Tepper <hasso at quagga.net>
 
 	* ospf_main.c: Make group to run as configurable.
diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index f560547..09ff197 100644
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -37,7 +37,6 @@
 #include "log.h"
 #include "memory.h"
 #include "privs.h"
-#include "debug.h"
 #include "sigevent.h"
 
 #include "ospfd/ospfd.h"