diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9de4523b20d9..f805fd90c07f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-18  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* acinclude (GLIBCXX_CONFIGURE_DOCBOOK): Fix quoting.
+
 2012-01-18  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* configure.ac: Move epub checks...
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index fd3ba96c4abd..3fc14c91419e 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -674,12 +674,12 @@ fi
 AC_MSG_CHECKING([for epub3 stylesheets for documentation creation])
 glibcxx_epub_stylesheets=no
 if test x"$glibcxx_local_stylesheets" = x"yes"; then
-   if test -f ${XSL_STYLE_DIR}/epub3/chunk.xsl; then
+   if test -f "$XSL_STYLE_DIR/epub3/chunk.xsl"; then
       glibcxx_epub_stylesheets=yes
    fi
 fi
 AC_MSG_RESULT($glibcxx_epub_stylesheets)
-AM_CONDITIONAL(BUILD_EPUB, test $glibcxx_epub_stylesheets= "yes")
+AM_CONDITIONAL(BUILD_EPUB, test x"$glibcxx_epub_stylesheets" = x"yes")
 
 ])
 
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 8ee0d24cc309..64f102b398c4 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -65791,13 +65791,13 @@ fi
 $as_echo_n "checking for epub3 stylesheets for documentation creation... " >&6; }
 glibcxx_epub_stylesheets=no
 if test x"$glibcxx_local_stylesheets" = x"yes"; then
-   if test -f ${XSL_STYLE_DIR}/epub3/chunk.xsl; then
+   if test -f "$XSL_STYLE_DIR/epub3/chunk.xsl"; then
       glibcxx_epub_stylesheets=yes
    fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_epub_stylesheets" >&5
 $as_echo "$glibcxx_epub_stylesheets" >&6; }
- if test $glibcxx_epub_stylesheets= "yes"; then
+ if test x"$glibcxx_epub_stylesheets" = x"yes"; then
   BUILD_EPUB_TRUE=
   BUILD_EPUB_FALSE='#'
 else