diff --git a/ChangeLog b/ChangeLog
index a8183eb0bb..37dad89cab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Dec  7 10:16:00 EST 2007 Daniel P. Berrange <berrange@redhat.com>
+
+	* configure.in: ensure $prefix is quoted in conditional test
+
 Fri Dec  7 14:55:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
 
 	* proxy/Makefile.am: Include gnulib code when building the
diff --git a/configure.in b/configure.in
index 123cde98ed..425bb4cf47 100644
--- a/configure.in
+++ b/configure.in
@@ -112,10 +112,10 @@ dnl if --prefix is /usr, don't use /usr/var for localstatedir
 dnl or /usr/etc for sysconfdir
 dnl as this makes a lot of things break in testing situations
 
-if test $prefix = "/usr" -a $localstatedir = '${prefix}/var' ; then
+if test "$prefix" = "/usr" -a "$localstatedir" = '${prefix}/var' ; then
     localstatedir='/var'
 fi
-if test $prefix = "/usr" -a $sysconfdir = '${prefix}/etc' ; then
+if test "$prefix" = "/usr" -a "$sysconfdir" = '${prefix}/etc' ; then
     sysconfdir='/etc'
 fi