diff --git a/ncat/ncat_connect.c b/ncat/ncat_connect.c
index 53c43db1c..8bc1f2a8a 100644
--- a/ncat/ncat_connect.c
+++ b/ncat/ncat_connect.c
@@ -977,7 +977,7 @@ int ncat_connect(void)
     nsock_pool_set_broadcast(mypool, 1);
 
 #ifdef HAVE_OPENSSL
-#ifdef HAVE_DTLS_CLIENT_METHOD
+#ifndef OPENSSL_NO_DTLS
     if(o.proto == IPPROTO_UDP)
         set_ssl_ctx_options((SSL_CTX *) nsock_pool_dtls_init(mypool, 0));
     else
diff --git a/ncat/ncat_main.c b/ncat/ncat_main.c
index 45507d14c..91d4a7667 100644
--- a/ncat/ncat_main.c
+++ b/ncat/ncat_main.c
@@ -976,7 +976,7 @@ int main(int argc, char *argv[])
 
     if (o.proto == IPPROTO_UDP) {
 
-#ifndef HAVE_DTLS_CLIENT_METHOD
+#ifdef OPENSSL_NO_DTLS
         if (o.ssl)
             bye("OpenSSL does not have DTLS support compiled in.");
 #endif
diff --git a/nsock/include/nsock_config.h.in b/nsock/include/nsock_config.h.in
index 2bc64c8d8..0c635fdbb 100644
--- a/nsock/include/nsock_config.h.in
+++ b/nsock/include/nsock_config.h.in
@@ -79,7 +79,6 @@
 #undef HAVE_NETDB_H
 
 #undef HAVE_OPENSSL
-#undef HAVE_DTLS_CLIENT_METHOD
 #undef HAVE_ALPN_SUPPORT
 
 #undef HAVE_EPOLL
diff --git a/nsock/include/nsock_winconfig.h b/nsock/include/nsock_winconfig.h
index 337db2196..221fa82dc 100644
--- a/nsock/include/nsock_winconfig.h
+++ b/nsock/include/nsock_winconfig.h
@@ -68,5 +68,4 @@
 #endif
 
 #define HAVE_OPENSSL 1
-#define HAVE_DTLS_CLIENT_METHOD 1
 #endif /* NSOCK_WINCONFIG_H */
diff --git a/nsock/src/configure b/nsock/src/configure
index 9cf78ca26..31e2c94d7 100755
--- a/nsock/src/configure
+++ b/nsock/src/configure
@@ -4916,30 +4916,6 @@ $as_echo "#define HAVE_OPENSSL 1" >>confdefs.h
   OPENSSL_LIBS="-lssl -lcrypto"
   LIBS_TMP="$LIBS"
   LIBS="$OPENSSL_LIBS $LIBS"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DTLS_client_method" >&5
-$as_echo_n "checking for DTLS_client_method... " >&6; }
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <openssl/ssl.h>
-int
-main ()
-{
-DTLS_client_method()
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; };
-$as_echo "#define HAVE_DTLS_CLIENT_METHOD 1" >>confdefs.h
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_set_alpn_protos" >&5
 $as_echo_n "checking for SSL_set_alpn_protos... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/nsock/src/configure.ac b/nsock/src/configure.ac
index 970b1f4bc..9d3547382 100644
--- a/nsock/src/configure.ac
+++ b/nsock/src/configure.ac
@@ -270,10 +270,6 @@ if test "$use_openssl" = "yes"; then
   OPENSSL_LIBS="-lssl -lcrypto"
   LIBS_TMP="$LIBS"
   LIBS="$OPENSSL_LIBS $LIBS"
-  AC_MSG_CHECKING([for DTLS_client_method])
-  AC_TRY_LINK([#include <openssl/ssl.h>], [DTLS_client_method()],
-    [AC_MSG_RESULT([yes]); AC_DEFINE(HAVE_DTLS_CLIENT_METHOD, 1, [DTLS_client_method available])],
-    [AC_MSG_RESULT([no])])
   AC_MSG_CHECKING([for SSL_set_alpn_protos])
   AC_TRY_LINK([#include <openssl/ssl.h>], [SSL_set_alpn_protos(NULL, NULL, 0)],
     [AC_MSG_RESULT([yes]); AC_DEFINE(HAVE_ALPN_SUPPORT, 1, [SSL ALPN protos support])],
diff --git a/nsock/src/nsock_internal.h b/nsock/src/nsock_internal.h
index c8f3ef1f3..bcf8c2da4 100644
--- a/nsock/src/nsock_internal.h
+++ b/nsock/src/nsock_internal.h
@@ -199,7 +199,7 @@ struct npool {
 #if HAVE_OPENSSL
   /* The SSL Context (options and such) */
   SSL_CTX *sslctx;
-#ifdef HAVE_DTLS_CLIENT_METHOD
+#ifndef OPENSSL_NO_DTLS
   SSL_CTX *dtlsctx;
 #endif
 #endif
diff --git a/nsock/src/nsock_ssl.c b/nsock/src/nsock_ssl.c
index 7ccfded74..29d7fe8ad 100644
--- a/nsock/src/nsock_ssl.c
+++ b/nsock/src/nsock_ssl.c
@@ -95,13 +95,13 @@ void nsp_ssl_cleanup(struct npool *nsp)
   {
     if (nsp->sslctx != NULL)
       SSL_CTX_free(nsp->sslctx);
-#ifdef HAVE_DTLS_CLIENT_METHOD
+#ifndef OPENSSL_NO_DTLS
     if (nsp->dtlsctx != NULL)
       SSL_CTX_free(nsp->dtlsctx);
 #endif
   }
   nsp->sslctx = NULL;
-#ifdef HAVE_DTLS_CLIENT_METHOD
+#ifndef OPENSSL_NO_DTLS
   nsp->dtlsctx = NULL;
 #endif
 }
@@ -198,7 +198,7 @@ nsock_ssl_ctx nsock_pool_ssl_init(nsock_pool ms_pool, int flags) {
   return nsock_pool_ssl_init_helper(ms->sslctx, flags);
 }
 
-#ifdef HAVE_DTLS_CLIENT_METHOD
+#ifndef OPENSSL_NO_DTLS
 
 /* Create an SSL_CTX and do initialisation, creating a DTLS client */
 static SSL_CTX *dtls_init_common() {