diff --git a/ChangeLog b/ChangeLog
index 785f79a04..00178d00b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-19  Adam Fedor  <fedor@gnu.org>
+
+	* configure.in: But CPPFLAGS in quotes
+
 2001-09-14  Adam Fedor  <fedor@gnu.org>
 
 	* configure.in: Remove redundancies in iconv checking. Remove
diff --git a/configure b/configure
index 26cb472b3..10294addf 100755
--- a/configure
+++ b/configure
@@ -2121,7 +2121,7 @@ else
   { echo "configure: error: The Objective-C compiler doesn't work or is not installed properly." 1>&2; exit 1; }
 fi
 
-# Don't rever any Objective-C flags as they are used in the next test
+# Don't revert any Objective-C flags as they are used in the next test
 
 #---------------------------------------------------------------------
 # Guess if we are using a compiler which allows us to change the class
@@ -5016,7 +5016,7 @@ else
 fi
 
 
-cppflags_temp=$CPPFLAGS
+cppflags_temp="$CPPFLAGS"
 libs_temp=$LIBS
 
 if test "$openssl_incdir" != "no"; then
@@ -5195,7 +5195,7 @@ else
 fi
 
 
-cppflags_temp=$CPPFLAGS
+cppflags_temp="$CPPFLAGS"
 libs_temp=$LIBS
 
 if test "$gmp_incdir" != "no"; then
@@ -5413,7 +5413,7 @@ else
   libiconv_libdir="no"
 fi
 
-  cppflags_temp=$CPPFLAGS
+  cppflags_temp="$CPPFLAGS"
 
   if test "$libiconv_libdir" != "no"; then
     CPPFLAGS="$CPPFLAGS -L$libiconv_libdir"
@@ -5465,7 +5465,7 @@ fi
 
   if test x"$av_cv_lib_giconv_main" = xyes; then
     cat >> confdefs.h <<\EOF
-#define HAVE_ICONV_H 1
+#define HAVE_ICONV 1
 EOF
 
     cat >> confdefs.h <<\EOF
@@ -5518,12 +5518,12 @@ fi
 
     if test x"$av_cv_lib_iconv_main" = xyes; then
       cat >> confdefs.h <<\EOF
-#define HAVE_ICONV_H 1
+#define HAVE_ICONV 1
 EOF
 
     fi
   fi
-  CPPFLAGS=$cppflag_temp
+  CPPFLAGS="$cppflag_temp"
 fi
 
 
diff --git a/configure.in b/configure.in
index 7e1326ea4..261e6eab5 100644
--- a/configure.in
+++ b/configure.in
@@ -381,7 +381,7 @@ else
   AC_MSG_ERROR(The Objective-C compiler doesn't work or is not installed properly.)
 fi
 
-# Don't rever any Objective-C flags as they are used in the next test
+# Don't revert any Objective-C flags as they are used in the next test
 
 #---------------------------------------------------------------------
 # Guess if we are using a compiler which allows us to change the class
@@ -821,7 +821,7 @@ AC_ARG_WITH(openssl-library,
   [  --with-openssl-library=PATH  library path for openssl libraries],
   openssl_libdir="$withval", openssl_libdir="no")
 
-cppflags_temp=$CPPFLAGS
+cppflags_temp="$CPPFLAGS"
 libs_temp=$LIBS
 
 if test "$openssl_incdir" != "no"; then
@@ -868,7 +868,7 @@ AC_ARG_WITH(gmp-library,
   [  --with-gmp-library=PATH  library path for gmp libraries],
   gmp_libdir="$withval", gmp_libdir="no")
 
-cppflags_temp=$CPPFLAGS
+cppflags_temp="$CPPFLAGS"
 libs_temp=$LIBS
 
 if test "$gmp_incdir" != "no"; then
@@ -908,7 +908,7 @@ if test $ac_cv_func_iconv = no; then
   AC_ARG_WITH(libiconv-library,
     [  --with-libiconv-library=PATH  library path for libiconv libraries],
     libiconv_libdir="$withval", libiconv_libdir="no")
-  cppflags_temp=$CPPFLAGS
+  cppflags_temp="$CPPFLAGS"
 
   if test "$libiconv_libdir" != "no"; then
     CPPFLAGS="$CPPFLAGS -L$libiconv_libdir"
@@ -925,7 +925,7 @@ if test $ac_cv_func_iconv = no; then
       AC_DEFINE(HAVE_ICONV)
     fi
   fi
-  CPPFLAGS=$cppflag_temp
+  CPPFLAGS="$cppflag_temp"
 fi
 
 AC_SUBST(SYSTEM_DEFS)