diff --git a/ChangeLog b/ChangeLog
index a1b8f60e..473ef982 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@ v0.71.0		27-Oct-2004
 		switches, these are no longer needed.
 		Added new subdirectory mbutils. Some sources from the mbsebbs
 		subdirectory are moved there.
+		Changed the CFLAGS back from -O3 to -O2 since there seem some
+		stablity problems and I want to rule out the possibility that
+		this is caused by bad gcc optimisation.
 
 	mbsebbs:
 		In change handle the first character of the name is not 
diff --git a/configure b/configure
index dcf8c75a..fbea8cdf 100755
--- a/configure
+++ b/configure
@@ -3018,7 +3018,7 @@ fi;
 if test "$debugging" = "yes"; then
     CFLAGS="-O -g -Wall -Wshadow -Wwrite-strings -Wstrict-prototypes -D_REENTRANT"
 else
-    CFLAGS="-O3 -fno-strict-aliasing -Wall -Wshadow -Wwrite-strings -Wstrict-prototypes -D_REENTRANT"
+    CFLAGS="-O2 -fno-strict-aliasing -Wall -Wshadow -Wwrite-strings -Wstrict-prototypes -D_REENTRANT"
 fi
 
 # Check whether --enable-optimize or --disable-optimize was given.
diff --git a/configure.in b/configure.in
index 869fe21a..433a0ae2 100644
--- a/configure.in
+++ b/configure.in
@@ -75,7 +75,7 @@ AC_ARG_ENABLE(debugging,   [  --enable-debugging      Compile for debugging], [
 if test "$debugging" = "yes"; then
     CFLAGS="-O -g -Wall -Wshadow -Wwrite-strings -Wstrict-prototypes -D_REENTRANT"
 else
-    CFLAGS="-O3 -fno-strict-aliasing -Wall -Wshadow -Wwrite-strings -Wstrict-prototypes -D_REENTRANT"
+    CFLAGS="-O2 -fno-strict-aliasing -Wall -Wshadow -Wwrite-strings -Wstrict-prototypes -D_REENTRANT"
 fi 
 
 AC_ARG_ENABLE(optimize,   [  --enable-optimize       Enable CPU optimize], [ optimize=$enableval ], [ optimize=no ])