diff --git a/ChangeLog b/ChangeLog
index 5386c4a..a96b40f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-29 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+	* configure.ac: Add new option --enable-gcc-rdynamic to link
+	  with -rdynamic.
+
 2004-12-23 Paul Jakma <paul@dishone.st>
 
 	configure.ac: Bump version to 0.97.4
diff --git a/configure.ac b/configure.ac
index 1f48947..608672b 100755
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 ##  Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org>
 ##  Portions Copyright (c) 2003 Paul Jakma <paul@dishone.st>
 ##
-## $Id: configure.ac,v 1.80 2004/12/23 20:09:44 paul Exp $
+## $Id: configure.ac,v 1.81 2004/12/29 17:50:22 ajs Exp $
 AC_PREREQ(2.53)
 
 AC_INIT(Quagga, 0.97.4, [http://bugzilla.quagga.net])
@@ -155,6 +155,8 @@
 [  --disable-capabilities        disable using POSIX capabilities])
 AC_ARG_ENABLE(gcc_ultra_verbose,
 [  --enable-gcc-ultra-verbose    enable ultra verbose GCC warnings])
+AC_ARG_ENABLE(gcc-rdynamic,
+[  --enable-gcc-rdynamic   enable gcc linking with -rdynamic for better backtraces])
 
 if test x"${enable_gcc_ultra_verbose}" = x"yes" ; then
   CFLAGS="${CFLAGS} -W -Wcast-qual -Wstrict-prototypes"
@@ -163,6 +165,10 @@
   CFLAGS="${CFLAGS} -Wpacked -Wpadded"
 fi
 
+if test x"${enable_gcc_rdynamic}" = x"yes" ; then
+  LDFLAGS="${LDFLAGS} -rdynamic"
+fi
+
 if test "${enable_broken_aliases}" = "yes"; then
   if test "${enable_netlink}" = "yes"
   then