diff --git a/INSTALL b/INSTALL
index ec959ff6a8..9496fc16c7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -107,7 +107,7 @@ flags:
     the settings in terms of various options that are described later
 
                       release   prerelease  development profiling gprof
-    optimization        -O2         -O2         -O         -O2     -O2
+    optimization        -O2         -O2         -Og        -O2     -O2
     assertions                       X           X
     stdlib-assertions                            X
     stdlib-debug
@@ -213,10 +213,11 @@ values):
 
   o --enable-optimization=VALUE enables you to set optimization to a
     higher level than the default, for example --enable-optimization=-O3.
+    Default is -Og when debugging is enabled, -O2 otherwise.
 
   o --disable-optimization - you can use this to disable compiler
     optimization of LyX. The compile may be much quicker with some
-    compilers, but LyX will run more slowly.
+    compilers, but LyX will be slower.
 
   o --enable-debug will add debug information to your binary. This
     requires a lot more disk space, but is a must if you want to try
diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 90113fdf37..03e40581c9 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -326,8 +326,8 @@ AC_ARG_ENABLE(optimization,
     enable_optimization=yes;)
 case $enable_optimization in
     yes)
-        if test $lyx_devel_version = yes ; then
-            lyx_optim=-O
+        if test $enable_debug = yes ; then
+            lyx_optim=-Og
         else
             lyx_optim=-O2
         fi;;