diff --git a/configure b/configure
index 63821d7ef3..c72d47bdb2 100755
--- a/configure
+++ b/configure
@@ -44,7 +44,7 @@ bochs_debug=0
 while [ $# \> 0 ] ; do
 	case "$1" in
 		--floppy)		assertparam "$1" $#; floppy=$2; shift 2;;
-		--bochs-debug)		bochs_debug=1; shift 1;;
+		--bochs-debug)	bochs_debug=1; shift 1;;
 		--help | -h)	usage; exit 0;;
 		*)				echo Invalid argument: \`$1\'; exit 1;;
 	esac
@@ -87,8 +87,8 @@ cat << EOF > BuildConfig
 # BuildConfig
 # Note: This file has been automatically generated by configure.
 
-FLOPPY_PATH	= "$floppy" ;
-GCC_PATH	= ${GCC_PATH} ;
-BOCHS_E9_HACK   = $bochs_debug ;
+FLOPPY_PATH		?= "$floppy" ;
+GCC_PATH		?= ${GCC_PATH} ;
+BOCHS_E9_HACK	?= $bochs_debug ;
 EOF