diff --git a/ChangeLog b/ChangeLog
index 47c66f9461..d71d891d26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-17  Kevin Cozens  <kcozens@cvs.gnome.org>
+
+	* configure.in: Added quotes in two AM_CONDITIONAL lines to avoid
+	complaints of "test: too many arguments" when running ./configure.
+
 2006-05-18  Michael Natterer  <mitch@gimp.org>
 
 	* app/tools/gimp-tools.c (gimp_tools_init): move the align tool
diff --git a/configure.in b/configure.in
index 8da8bb226b..7281cb9b7f 100644
--- a/configure.in
+++ b/configure.in
@@ -1160,7 +1160,7 @@ else
   have_gtkhtml2="no (GtkHtml2 support disabled)"
 fi
 
-AM_CONDITIONAL(BUILD_HELPBROWSER, test x$have_gtkhtml2 = xyes)
+AM_CONDITIONAL(BUILD_HELPBROWSER, test "x$have_gtkhtml2" = xyes)
 
 
 ###################
@@ -1274,7 +1274,7 @@ if test "x$with_gnomeprint" != xno; then
     have_gnomeprint="no (libgnomeprintui not found!)")
 fi
 
-AM_CONDITIONAL(HAVE_GNOMEPRINT, test x$have_gnomeprint = xyes)
+AM_CONDITIONAL(HAVE_GNOMEPRINT, test "x$have_gnomeprint" = xyes)
 
 if test "x$have_gnomeprint" = xyes; then
   GNOMEPRINT='gnomeprint$(EXEEXT)'