diff --git a/configure b/configure
index c8744726bd..71ffc1f5f9 100755
--- a/configure
+++ b/configure
@@ -19272,7 +19272,7 @@ BIND9_MAKE_INCLUDES=$BIND9_TOP_BUILDDIR/make/includes
 BIND9_MAKE_RULES=$BIND9_TOP_BUILDDIR/make/rules
 
 . $srcdir/version
-BIND9_PRODUCT="PRODUCT=${PRODUCT}"
+BIND9_PRODUCT="PRODUCT=\"${PRODUCT}\""
 
 BIND9_VERSION="VERSION=${MAJORVER}.${MINORVER}${PATCHVER:+.}${PATCHVER}${RELEASETYPE}${RELEASEVER}"
 
diff --git a/configure.in b/configure.in
index 03eaebb089..d659484a11 100644
--- a/configure.in
+++ b/configure.in
@@ -3239,7 +3239,7 @@ AC_SUBST_FILE(BIND9_MAKE_RULES)
 BIND9_MAKE_RULES=$BIND9_TOP_BUILDDIR/make/rules
 
 . $srcdir/version
-BIND9_PRODUCT="PRODUCT=${PRODUCT}"
+BIND9_PRODUCT="PRODUCT=\"${PRODUCT}\""
 AC_SUBST(BIND9_PRODUCT)
 BIND9_VERSION="VERSION=${MAJORVER}.${MINORVER}${PATCHVER:+.}${PATCHVER}${RELEASETYPE}${RELEASEVER}"
 AC_SUBST(BIND9_VERSION)