diff --git a/README b/README
index 60e0f5ad9..be44883f6 100644
--- a/README
+++ b/README
@@ -126,7 +126,6 @@ BUILDING AND INSTALLING FLTK UNDER UNIX
     Windows counterparts.  Other options include:
 
 	--enable-debug          - Enable debugging code & symbols
-	--enable-production     - Enable optimization
 	--enable-shared         - Enable generation of shared libraries
 	--enable-windows-style  - Enable the Microsoft Windows "look-n-feel"
 
diff --git a/configure.in b/configure.in
index 9609f1c43..69862e4de 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl# -*- sh -*-
 dnl# the "configure" script is made from this by running GNU "autoconf"
 dnl#
-dnl# "$Id: configure.in,v 1.5 1998/10/21 17:57:42 mike Exp $"
+dnl# "$Id: configure.in,v 1.6 1998/10/21 20:42:08 mike Exp $"
 dnl#
 dnl# for the Fast Light Tool Kit (FLTK).
 dnl#
@@ -36,15 +36,12 @@ else
   LIBCOMMAND="ar crvs"
 fi
 
-DEBUGFLAG=""
+DEBUGFLAG="-O2"
 BORDER_WIDTH=3
 
 AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]],if eval "test x$enable_debug = xyes"; then
   DEBUGFLAG="-g"
 fi)
-AC_ARG_ENABLE(debug, [  --enable-production     turn off debugging [default=yes]],if eval "test x$enable_production != xno"; then
-  DEBUGFLAG="-O2"
-fi)
 AC_ARG_ENABLE(shared, [  --enable-shared         turn on shared libraries [default=no]],[
 if eval "test x$enable_shared = xyes"; then
   RANLIB=":"
@@ -73,9 +70,8 @@ AC_ARG_ENABLE(winstyle, [  --enable-windows-style  turn on windows look-n-feel [
   BORDER_WIDTH=2
 fi)
 
-if test -n "$DEBUGFLAG"; then
-  CFLAGS="$DEBUGFLAG $CFLAGS"
-fi
+CFLAGS="$DEBUGFLAG $CFLAGS"
+CXXFLAGS="$DEBUGFLAG $CXXFLAGS"
 
 AC_PROG_CC
 AC_PROG_CXX
@@ -145,5 +141,5 @@ AC_CONFIG_HEADER(config.h:configh.in)
 AC_OUTPUT(makeinclude)
 
 dnl#
-dnl# End of "$Id: configure.in,v 1.5 1998/10/21 17:57:42 mike Exp $".
+dnl# End of "$Id: configure.in,v 1.6 1998/10/21 20:42:08 mike Exp $".
 dnl#