diff --git a/configure.ac b/configure.ac
index d7f4c1f45c4769eaebcd121974d075e51962b821..3cff1e1dae1b844c11c80a01ae4675757a4018fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -806,10 +806,11 @@ else
       fi
     fi
 
+    if test X"$OPENSSL_ENABLED" = X"1"; then
+       AC_DEFINE(USE_SSLEAY, 1, [if SSL is enabled])
+    fi
     USE_SSLEAY="$OPENSSL_ENABLED"
-    AC_DEFINE_UNQUOTED(USE_SSLEAY, $USE_SSLEAY, [if SSL is enabled])
     AC_SUBST(USE_SSLEAY)
-    AC_SUBST(USE_OPENSSL)
 
     if test X"$OPT_SSL" != Xoff &&
        test "$OPENSSL_ENABLED" != "1"; then
diff --git a/packages/vms/config-vms.h_with_ssl b/packages/vms/config-vms.h_with_ssl
index e3bc60dac21f7c9e60243cc729467b8d81a2ef1b..0d737ec3f6fb62dddc3b5c306c14a0f24ede71b0 100755
--- a/packages/vms/config-vms.h_with_ssl
+++ b/packages/vms/config-vms.h_with_ssl
@@ -160,7 +160,7 @@
 */
 #define HAVE_OPENSSL_ENGINE_H 1
 
-#endif /* OPENSSL_ENABLED */
+#endif /* USE_SSLEAY */
 /* OpenSSL section ends here */
 
 /* Define if you have the <pwd.h> header file.  */
diff --git a/packages/vms/config-vms.h_without_ssl b/packages/vms/config-vms.h_without_ssl
index d7649bb8359031b6f145da95e78092c3ef74e48b..00dc673df6895ca6ba94643f84f58597ffa63061 100755
--- a/packages/vms/config-vms.h_without_ssl
+++ b/packages/vms/config-vms.h_without_ssl
@@ -160,7 +160,7 @@
 */
 #define HAVE_OPENSSL_ENGINE_H 1
 
-#endif /* OPENSSL_ENABLED */
+#endif /* USE_SSLEAY */
 /* OpenSSL section ends here */
 
 /* Define if you have the <pwd.h> header file.  */