diff --git a/configure b/configure
index 90079978..a7a1a0c4 100755
--- a/configure
+++ b/configure
@@ -347,7 +347,7 @@ echo                                                              >> config.mk
 if [ $debug -eq 1 ]; then
         echo "CFLAGS     += -O0 -g"                               >> config.mk
 else
-        echo "CFLAGS     += -Os"                                  >> config.mk
+        echo "CFLAGS     += -O2"                                  >> config.mk
 fi
 
 echo                                                              >> config.mk
@@ -375,7 +375,7 @@ fi
 
 if [ x"$libite" != x"" ]; then
         echo "LIBITE      = $libite"                              >> config.mk
-        echo "CFLAGS     += -I\$(LIBITE)/include"                 >> config.mk
+        echo "CPPFLAGS   += -I\$(LIBITE)/include"                 >> config.mk
         echo "LDFLAGS    += -L\$(LIBITE)/lib"                     >> config.mk
         echo "LDLIBS     += -l:libite.so.2"                       >> config.mk
 else
@@ -386,7 +386,7 @@ fi
 
 if [ x"$libuev" != x"" ]; then
         echo "LIBUEV      = $libuev"                              >> config.mk
-        echo "CFLAGS     += -I\$(LIBUEV)/include"                 >> config.mk
+        echo "CPPFLAGS   += -I\$(LIBUEV)/include"                 >> config.mk
         echo "LDFLAGS    += -L\$(LIBUEV)/lib"                     >> config.mk
         echo "LDLIBS     += -l:libuev.so.1"                       >> config.mk
 else
@@ -397,7 +397,7 @@ fi
 
 echo                                                              >> config.mk
 echo "export libdir plugindir incdir"                             >> config.mk
-echo "export CPPFLAGS LDFLAGS LDLIBS STATIC"                      >> config.mk
+echo "export CFLAGS CPPFLAGS LDFLAGS LDLIBS STATIC"               >> config.mk
 
 ##############################################################################
 echo "/* Generated by finit configure script. */"    > config.h