diff --git a/configure b/configure
index b0e4c7ec7268ab107b8ad6e1d882ce461c53eaed..8353bade232d6effc70da5929d67d9127f726b37 100755
--- a/configure
+++ b/configure
@@ -19771,7 +19771,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 8fe8f09fc2bb9a4b51adfda1b8ce78d95fa72c09..f8b72f3d7026a21258f2a34025bb1f402d74b0c7 100644
--- a/configure.in
+++ b/configure.in
@@ -3425,7 +3425,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)