diff --git a/ChangeLog b/ChangeLog
index eb7ce2e0c5d82ce5925b29bc78896dfafd58ae89..6b7f2e34f0d7827fe82d28448405d0cca0111fc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-18  Niels M�ller  <niels@s3.kth.se>
+
+	* configure.ac: Don't use -ggdb3 with gcc-2.96. 
+
 2002-05-16  Niels M�ller  <nisse@cuckoo.hack.org>
 
 	* sparc/aes.asm: Deleted registers i and t3.
diff --git a/configure.ac b/configure.ac
index a99b2fa160e14e0d92957876bff4c886cee14804..da5aeaedddba57e8e989d4edb9d7a7c7b5e33f4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,9 +108,15 @@ LSH_RPATH_FIX
 
 # Set these flags *last*, or else the test programs won't compile
 if test x$GCC = xyes ; then
-    CFLAGS="$CFLAGS -ggdb3 -Wall -W \
- -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes \
- -Wpointer-arith -Wbad-function-cast -Wnested-externs"
+  # Using -ggdb3 makes (some versions of) Redhat's gcc-2.96 dump core
+  if "$CC" --version | grep '^2\.96$' 1>/dev/null 2>&1; then
+    true
+  else
+    CFLAGS="$CFLAGS -ggdb3"
+  fi
+  CFLAGS="$CFLAGS -Wall -W \
+  -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes \
+  -Wpointer-arith -Wbad-function-cast -Wnested-externs"
 
 # Don't enable -Wcast-align as it results in tons of warnings in the
 # DES code. And when using stdio.