diff --git a/configure b/configure
index 25280b34a..38a5c3c72 100755
--- a/configure
+++ b/configure
@@ -2735,7 +2735,10 @@ then
        CFLAGS="-O -g -Wall -Wstrict-prototypes -Wmissing-prototypes"
        C_INTERF_FLAGS="-O -g -Wall -Wstrict-prototypes -Wmissing-prototypes"
      else
-       CFLAGS="-O3 -fno-gcse -fno-crossjumping -fomit-frame-pointer -Wall -Wstrict-prototypes -Wmissing-prototypes"
+       CFLAGS="-O3 -fomit-frame-pointer -Wall -Wstrict-prototypes -Wmissing-prototypes"
+       case "`$CC --version < /dev/null`" in
+	  *3.4*) CFLAGS="-fno-gcse -fno-crossjumping $CFLAGS" ;;
+       esac
        C_INTERF_FLAGS="-O3 -Wall -Wstrict-prototypes -Wmissing-prototypes"
        C_PARSER_FLAGS="-O3 -Wall -Wstrict-prototypes -Wmissing-prototypes"
        case "$target_cpu" in
@@ -3381,7 +3384,7 @@ fi
     yap_cv_readline=no
     if test "$prefix" = "NONE"
     then
-      prefix="c:/Program\\ Files/Yap"
+      prefix="c:/Yap"
     fi
   else
     use_malloc="yes"
@@ -3461,7 +3464,7 @@ fi
 
   if test "$prefix" = "NONE"
   then
-    prefix="c:/Program\\ Files/Yap"
+    prefix="c:/Yap"
   fi
 else
   INSTALL_COMMAND="install_unix"
diff --git a/configure.in b/configure.in
index 1851c6bb8..19e4a8dfd 100644
--- a/configure.in
+++ b/configure.in
@@ -242,7 +242,10 @@ then
        CFLAGS="-O -g -Wall -Wstrict-prototypes -Wmissing-prototypes"
        C_INTERF_FLAGS="-O -g -Wall -Wstrict-prototypes -Wmissing-prototypes"
      else
-       CFLAGS="-O3 -fno-gcse -fno-crossjumping -fomit-frame-pointer -Wall -Wstrict-prototypes -Wmissing-prototypes"
+       CFLAGS="-O3 -fomit-frame-pointer -Wall -Wstrict-prototypes -Wmissing-prototypes"
+       case "`$CC --version < /dev/null`" in	
+	  *3.4*) CFLAGS="-fno-gcse -fno-crossjumping $CFLAGS" ;;
+       esac
        C_INTERF_FLAGS="-O3 -Wall -Wstrict-prototypes -Wmissing-prototypes"
        C_PARSER_FLAGS="-O3 -Wall -Wstrict-prototypes -Wmissing-prototypes"
        case "$target_cpu" in
@@ -344,7 +347,7 @@ then
     yap_cv_readline=no
     if test "$prefix" = "NONE"
     then
-      prefix="c:/Program\\ Files/Yap"
+      prefix="c:/Yap"
     fi
   else
     use_malloc="yes"
@@ -357,7 +360,7 @@ then
   AC_CHECK_LIB(wsock32,main)
   if test "$prefix" = "NONE"
   then
-    prefix="c:/Program\\ Files/Yap"
+    prefix="c:/Yap"
   fi
 else
   INSTALL_COMMAND="install_unix"