diff --git a/configure b/configure
index a778fa2ff2..eb9d73aa4a 100755
--- a/configure
+++ b/configure
@@ -1593,7 +1593,7 @@ if test "$bigendian" = "yes" ; then
 fi
 echo "#define HOST_LONG_BITS $hostlongbits" >> $config_h
 if test "$mingw32" = "yes" ; then
-  echo "CONFIG_WIN32=yes" >> $config_mak
+  echo "CONFIG_WIN32=y" >> $config_mak
   echo "#define CONFIG_WIN32 1" >> $config_h
 else
   cat > $TMPC << EOF
@@ -1619,17 +1619,17 @@ if [ "$openbsd" = "yes" ] ; then
 fi
 
 if test "$darwin" = "yes" ; then
-  echo "CONFIG_DARWIN=yes" >> $config_mak
+  echo "CONFIG_DARWIN=y" >> $config_mak
   echo "#define CONFIG_DARWIN 1" >> $config_h
 fi
 
 if test "$aix" = "yes" ; then
-  echo "CONFIG_AIX=yes" >> $config_mak
+  echo "CONFIG_AIX=y" >> $config_mak
   echo "#define CONFIG_AIX 1" >> $config_h
 fi
 
 if test "$solaris" = "yes" ; then
-  echo "CONFIG_SOLARIS=yes" >> $config_mak
+  echo "CONFIG_SOLARIS=y" >> $config_mak
   echo "#define HOST_SOLARIS $solarisrev" >> $config_h
   if test "$needs_libsunmath" = "yes" ; then
     echo "NEEDS_LIBSUNMATH=yes" >> $config_mak
@@ -1637,7 +1637,7 @@ if test "$solaris" = "yes" ; then
   fi
 fi
 if test -n "$sparc_cpu"; then
-  echo "CONFIG__sparc_${sparc_cpu}__=yes" >> $config_mak
+  echo "CONFIG__sparc_${sparc_cpu}__=y" >> $config_mak
   echo "#define __sparc_${sparc_cpu}__ 1" >> $config_h
 fi
 if test "$gprof" = "yes" ; then
@@ -1645,31 +1645,31 @@ if test "$gprof" = "yes" ; then
   echo "#define HAVE_GPROF 1" >> $config_h
 fi
 if test "$static" = "yes" ; then
-  echo "CONFIG_STATIC=yes" >> $config_mak
+  echo "CONFIG_STATIC=y" >> $config_mak
   echo "#define CONFIG_STATIC 1" >> $config_h
 fi
 if test $profiler = "yes" ; then
   echo "#define CONFIG_PROFILER 1" >> $config_h
 fi
 if test "$slirp" = "yes" ; then
-  echo "CONFIG_SLIRP=yes" >> $config_mak
+  echo "CONFIG_SLIRP=y" >> $config_mak
   echo "#define CONFIG_SLIRP 1" >> $config_h
 fi
 if test "$vde" = "yes" ; then
-  echo "CONFIG_VDE=yes" >> $config_mak
+  echo "CONFIG_VDE=y" >> $config_mak
   echo "#define CONFIG_VDE 1" >> $config_h
   echo "VDE_LIBS=-lvdeplug" >> $config_mak
 fi
 for card in $audio_card_list; do
     def=CONFIG_`echo $card | tr '[:lower:]' '[:upper:]'`
-    echo "$def=yes" >> $config_mak
+    echo "$def=y" >> $config_mak
     echo "#define $def 1" >> $config_h
 done
 echo "#define AUDIO_DRIVERS \\" >> $config_h
 for drv in $audio_drv_list; do
     echo "    &${drv}_audio_driver, \\" >>$config_h
     def=CONFIG_`echo $drv | tr '[:lower:]' '[:upper:]'`
-    echo "$def=yes" >> $config_mak
+    echo "$def=y" >> $config_mak
     if test "$drv" = "fmod"; then
         echo "CONFIG_FMOD_LIB=$fmod_lib" >> $config_mak
         echo "CONFIG_FMOD_INC=$fmod_inc" >> $config_mak
@@ -1679,17 +1679,17 @@ for drv in $audio_drv_list; do
 done
 echo "" >>$config_h
 if test "$mixemu" = "yes" ; then
-  echo "CONFIG_MIXEMU=yes" >> $config_mak
+  echo "CONFIG_MIXEMU=y" >> $config_mak
   echo "#define CONFIG_MIXEMU 1" >> $config_h
 fi
 if test "$vnc_tls" = "yes" ; then
-  echo "CONFIG_VNC_TLS=yes" >> $config_mak
+  echo "CONFIG_VNC_TLS=y" >> $config_mak
   echo "CONFIG_VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_mak
   echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_mak
   echo "#define CONFIG_VNC_TLS 1" >> $config_h
 fi
 if test "$vnc_sasl" = "yes" ; then
-  echo "CONFIG_VNC_SASL=yes" >> $config_mak
+  echo "CONFIG_VNC_SASL=y" >> $config_mak
   echo "CONFIG_VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_mak
   echo "CONFIG_VNC_SASL_LIBS=$vnc_sasl_libs" >> $config_mak
   echo "#define CONFIG_VNC_SASL 1" >> $config_h
@@ -1718,7 +1718,7 @@ else
 fi
 if test "$sdl1" = "yes" ; then
   echo "#define CONFIG_SDL 1" >> $config_h
-  echo "CONFIG_SDL=yes" >> $config_mak
+  echo "CONFIG_SDL=y" >> $config_mak
   if test "$target_softmmu" = "no" -o "$static" = "yes"; then
     echo "SDL_LIBS=$sdl_static_libs" >> $config_mak
   elif test "$sdl_x11" = "yes" ; then
@@ -1734,11 +1734,11 @@ if test "$sdl1" = "yes" ; then
 fi
 if test "$cocoa" = "yes" ; then
   echo "#define CONFIG_COCOA 1" >> $config_h
-  echo "CONFIG_COCOA=yes" >> $config_mak
+  echo "CONFIG_COCOA=y" >> $config_mak
 fi
 if test "$curses" = "yes" ; then
   echo "#define CONFIG_CURSES 1" >> $config_h
-  echo "CONFIG_CURSES=yes" >> $config_mak
+  echo "CONFIG_CURSES=y" >> $config_mak
   if test "$ncurses" = "yes" ; then
     echo "CURSES_LIBS=-lncurses" >> $config_mak
   else
@@ -1761,17 +1761,17 @@ if test "$inotify" = "yes" ; then
   echo "#define CONFIG_INOTIFY 1" >> $config_h
 fi
 if test "$curl" = "yes" ; then
-  echo "CONFIG_CURL=yes" >> $config_mak
+  echo "CONFIG_CURL=y" >> $config_mak
   echo "CURL_LIBS=$curl_libs" >> $config_mak
   echo "#define CONFIG_CURL 1" >> $config_h
 fi
 if test "$brlapi" = "yes" ; then
-  echo "CONFIG_BRLAPI=yes" >> $config_mak
+  echo "CONFIG_BRLAPI=y" >> $config_mak
   echo "#define CONFIG_BRLAPI 1" >> $config_h
   echo "BRLAPI_LIBS=-lbrlapi" >> $config_mak
 fi
 if test "$bluez" = "yes" ; then
-  echo "CONFIG_BLUEZ=yes" >> $config_mak
+  echo "CONFIG_BLUEZ=y" >> $config_mak
   echo "CONFIG_BLUEZ_CFLAGS=$bluez_cflags" >> $config_mak
   echo "CONFIG_BLUEZ_LIBS=$bluez_libs" >> $config_mak
   echo "#define CONFIG_BLUEZ 1" >> $config_h
@@ -1781,10 +1781,10 @@ if test "$xen" = "yes" ; then
 fi
 if test "$aio" = "yes" ; then
   echo "#define CONFIG_AIO 1" >> $config_h
-  echo "CONFIG_AIO=yes" >> $config_mak
+  echo "CONFIG_AIO=y" >> $config_mak
 fi
 if test "$io_thread" = "yes" ; then
-  echo "CONFIG_IOTHREAD=yes" >> $config_mak
+  echo "CONFIG_IOTHREAD=y" >> $config_mak
   echo "#define CONFIG_IOTHREAD 1" >> $config_h
 fi
 if test "$blobs" = "yes" ; then
@@ -1856,7 +1856,7 @@ fi
 
 if test "$xen" = "yes" ;
     then
-    echo "CONFIG_XEN=yes" >> $config_mak
+    echo "CONFIG_XEN=y" >> $config_mak
 fi
 
 tools=
@@ -1983,17 +1983,17 @@ case "$target_cpu" in
     echo "#define TARGET_I386 1" >> $config_h
     if test $kqemu = "yes" -a "$target_softmmu" = "yes"
     then
-      echo "CONFIG_KQEMU=yes" >> $config_mak
+      echo "CONFIG_KQEMU=y" >> $config_mak
       echo "#define CONFIG_KQEMU 1" >> $config_h
     fi
     if test "$target_kvm" = "yes" ; then
-      echo "CONFIG_KVM=yes" >> $config_mak
+      echo "CONFIG_KVM=y" >> $config_mak
       echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
       echo "#define CONFIG_KVM 1" >> $config_h
     fi
     if test "$xen" = "yes" -a "$target_softmmu" = "yes";
     then
-      echo "CONFIG_XEN=yes" >> $config_mak
+      echo "CONFIG_XEN=y" >> $config_mak
       echo "#define CONFIG_XEN 1" >> $config_h
     fi
     target_phys_bits=32
@@ -2005,17 +2005,17 @@ case "$target_cpu" in
     echo "#define TARGET_X86_64 1" >> $config_h
     if test $kqemu = "yes" -a "$target_softmmu" = "yes" -a $cpu = "x86_64"
     then
-      echo "CONFIG_KQEMU=yes" >> $config_mak
+      echo "CONFIG_KQEMU=y" >> $config_mak
       echo "#define CONFIG_KQEMU 1" >> $config_h
     fi
     if test "$target_kvm" = "yes" ; then
-      echo "CONFIG_KVM=yes" >> $config_mak
+      echo "CONFIG_KVM=y" >> $config_mak
       echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
       echo "#define CONFIG_KVM 1" >> $config_h
     fi
     if test "$xen" = "yes" -a "$target_softmmu" = "yes"
     then
-      echo "CONFIG_XEN=yes" >> $config_mak
+      echo "CONFIG_XEN=y" >> $config_mak
       echo "#define CONFIG_XEN 1" >> $config_h
     fi
     target_phys_bits=64
@@ -2094,7 +2094,7 @@ case "$target_cpu" in
     echo "#define TARGET_PPC 1" >> $config_h
     echo "#define TARGET_PPCEMB 1" >> $config_h
     if test "$target_kvm" = "yes" ; then
-      echo "CONFIG_KVM=yes" >> $config_mak
+      echo "CONFIG_KVM=y" >> $config_mak
       echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
       echo "#define CONFIG_KVM 1" >> $config_h
     fi
@@ -2169,19 +2169,19 @@ if test "$target_bigendian" = "yes" ; then
   echo "#define TARGET_WORDS_BIGENDIAN 1" >> $config_h
 fi
 if test "$target_softmmu" = "yes" ; then
-  echo "CONFIG_SOFTMMU=yes" >> $config_mak
+  echo "CONFIG_SOFTMMU=y" >> $config_mak
   echo "#define CONFIG_SOFTMMU 1" >> $config_h
 fi
 if test "$target_user_only" = "yes" ; then
-  echo "CONFIG_USER_ONLY=yes" >> $config_mak
+  echo "CONFIG_USER_ONLY=y" >> $config_mak
   echo "#define CONFIG_USER_ONLY 1" >> $config_h
 fi
 if test "$target_linux_user" = "yes" ; then
-  echo "CONFIG_LINUX_USER=yes" >> $config_mak
+  echo "CONFIG_LINUX_USER=y" >> $config_mak
   echo "#define CONFIG_LINUX_USER 1" >> $config_h
 fi
 if test "$target_darwin_user" = "yes" ; then
-  echo "CONFIG_DARWIN_USER=yes" >> $config_mak
+  echo "CONFIG_DARWIN_USER=y" >> $config_mak
   echo "#define CONFIG_DARWIN_USER 1" >> $config_h
 fi
 list=""
@@ -2209,11 +2209,11 @@ if test "$target_cpu" = "arm" \
      -o "$target_cpu" = "sparc" \
      -o "$target_cpu" = "sparc64" \
      -o "$target_cpu" = "sparc32plus"; then
-  echo "CONFIG_SOFTFLOAT=yes" >> $config_mak
+  echo "CONFIG_SOFTFLOAT=y" >> $config_mak
   echo "#define CONFIG_SOFTFLOAT 1" >> $config_h
 fi
 if test "$target_user_only" = "yes" -a "$bflt" = "yes"; then
-  echo "TARGET_HAS_BFLT=yes" >> $config_mak
+  echo "TARGET_HAS_BFLT=y" >> $config_mak
   echo "#define TARGET_HAS_BFLT 1" >> $config_h
 fi
 if test "$target_user_only" = "yes" \
@@ -2222,11 +2222,11 @@ if test "$target_user_only" = "yes" \
 fi
 # 32 bit ELF loader in addition to native 64 bit loader?
 if test "$target_user_only" = "yes" -a "$elfload32" = "yes"; then
-  echo "TARGET_HAS_ELFLOAD32=yes" >> $config_mak
+  echo "TARGET_HAS_ELFLOAD32=y" >> $config_mak
   echo "#define TARGET_HAS_ELFLOAD32 1" >> $config_h
 fi
 if test "$target_bsd_user" = "yes" ; then
-  echo "CONFIG_BSD_USER=yes" >> $config_mak
+  echo "CONFIG_BSD_USER=y" >> $config_mak
   echo "#define CONFIG_BSD_USER 1" >> $config_h
 fi