diff --git a/configure b/configure
index eca4989af1..7d4bed8ddf 100755
--- a/configure
+++ b/configure
@@ -18636,7 +18636,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 7dfd6b18de..f68f3dff1f 100644
--- a/configure.in
+++ b/configure.in
@@ -2828,7 +2828,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)