diff --git a/configure b/configure
index 1b65a2c67d30ffad8e48e7e3dadd28dc0ef69d93..728871246e22a5798194fa7937b755d93974aa9e 100755
--- a/configure
+++ b/configure
@@ -1662,12 +1662,12 @@ OPENLDAP_VERSION=$OL_VERSION
 
 
 cat >>confdefs.h <<_ACEOF
-#define OPENLDAP_PACKAGE $OL_PACKAGE
+#define OPENLDAP_PACKAGE "$OL_PACKAGE"
 _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define OPENLDAP_VERSION $OL_VERSION
+#define OPENLDAP_VERSION "$OL_VERSION"
 _ACEOF
 
 
@@ -34925,7 +34925,6 @@ if test "${with_xxinstall+set}" = set; then
 
 fi;
 
-
           ac_config_files="$ac_config_files Makefile:build/top.mk:Makefile.in:build/dir.mk"
 
           ac_config_files="$ac_config_files doc/Makefile:build/top.mk:doc/Makefile.in:build/dir.mk"
diff --git a/configure.in b/configure.in
index e9c7643152b20643a10ae2e7253ed006ae2aa119..1c49cf59fb3a382f13cbd960d4c863abde522f59 100644
--- a/configure.in
+++ b/configure.in
@@ -59,8 +59,8 @@ OPENLDAP_VERSION=$OL_VERSION
 AC_SUBST(OPENLDAP_PACKAGE)
 AC_SUBST(OPENLDAP_VERSION)
 
-AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,$OL_PACKAGE,OpenLDAP Package)
-AC_DEFINE_UNQUOTED(OPENLDAP_VERSION,$OL_VERSION,OpenLDAP Version)
+AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,"$OL_PACKAGE",OpenLDAP Package)
+AC_DEFINE_UNQUOTED(OPENLDAP_VERSION,"$OL_VERSION",OpenLDAP Version)
 
 AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION,$OL_API_INC,Vendor Version)
 AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_MAJOR,$OL_MAJOR,Vendor Major)
@@ -2882,9 +2882,6 @@ AC_ARG_WITH(xxinstall,[
 See INSTALL file for further details.])
 
 dnl ----------------------------------------------------------------
-dnl final output
-dnl
-
 AC_CONFIG_FILES(Makefile:build/top.mk:Makefile.in:build/dir.mk)
 AC_CONFIG_FILES(doc/Makefile:build/top.mk:doc/Makefile.in:build/dir.mk)
 AC_CONFIG_FILES(doc/man/Makefile:build/top.mk:doc/man/Makefile.in:build/dir.mk)
@@ -2893,7 +2890,7 @@ AC_CONFIG_FILES(doc/man/man3/Makefile:build/top.mk:doc/man/man3/Makefile.in:buil
 AC_CONFIG_FILES(doc/man/man5/Makefile:build/top.mk:doc/man/man5/Makefile.in:build/man.mk)
 AC_CONFIG_FILES(doc/man/man8/Makefile:build/top.mk:doc/man/man8/Makefile.in:build/man.mk)
 AC_CONFIG_FILES(clients/Makefile:build/top.mk:clients/Makefile.in:build/dir.mk)
-AC_CONFIG_FILES(clients/tools/Makefile:build/top.mk:clients/tools/Makefile.in:build/rules.mk )
+AC_CONFIG_FILES(clients/tools/Makefile:build/top.mk:clients/tools/Makefile.in:build/rules.mk)
 AC_CONFIG_FILES(include/Makefile:build/top.mk:include/Makefile.in)
 AC_CONFIG_FILES(libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk)
 AC_CONFIG_FILES(libraries/libavl/Makefile:build/top.mk:libraries/libavl/Makefile.in:build/lib.mk:build/lib-static.mk)