Index: acinclude.m4
==================================================================
--- acinclude.m4
+++ acinclude.m4
@@ -108,15 +108,11 @@
 			[path to include directory of OpenSSL or LibreSSL installation]
 		), [
 			opensslincludedir="$withval"
 		], [
 			if test ! -z "$openssldir"; then
-				if test -f "${openssldir}/include/openssl/ssl.h"; then
-					opensslincludedir="${openssldir}/include/openssl"
-				else
-					opensslincludedir="${openssldir}/include"
-				fi
+				opensslincludedir="${openssldir}/include"
 			else
 				opensslincludedir=''
 			fi
 		]
 	)
@@ -123,11 +119,11 @@
 	AC_MSG_CHECKING([for OpenSSL include directory])
 	AC_MSG_RESULT($opensslincludedir)
 
 	dnl Set SSL include vars
 	if test ! -z "$opensslincludedir"; then
-		if test -f "$opensslincludedir/ssl.h"; then
+		if test -f "$opensslincludedir/openssl/ssl.h"; then
 			TCLTLS_SSL_CFLAGS="-I$opensslincludedir"
 			TCLTLS_SSL_INCLUDES="-I$opensslincludedir"
 			AC_MSG_CHECKING([for ssl.h])
 			AC_MSG_RESULT([yes])
 		else
@@ -229,17 +225,15 @@
 	fi
 	if test -z "$TCLTLS_SSL_CFLAGS"; then
 		TCLTLS_SSL_CFLAGS=""
 	fi
 	if test -z "$TCLTLS_SSL_INCLUDES"; then
-		if test -d /usr/include/openssl; then
-			TCLTLS_SSL_INCLUDES="-I/usr/include/openssl"
-		else
+		if test -f /usr/include/openssl/ssl.h; then
 			TCLTLS_SSL_INCLUDES="-I/usr/include"
 		fi
 	fi
 
 	dnl Include config variables in --help list and make available to be substituted via AC_SUBST.
 	AC_ARG_VAR([TCLTLS_SSL_CFLAGS], [C compiler flags for OpenSSL or LibreSSL])
 	AC_ARG_VAR([TCLTLS_SSL_INCLUDES], [C compiler include paths for OpenSSL or LibreSSL])
 	AC_ARG_VAR([TCLTLS_SSL_LIBS], [libraries to pass to the linker for OpenSSL or LibreSSL])
 ])

Index: configure
==================================================================
--- configure
+++ configure
@@ -9196,15 +9196,11 @@
 			opensslincludedir="$withval"
 
 else $as_nop
 
 			if test ! -z "$openssldir"; then
-				if test -f "${openssldir}/include/openssl/ssl.h"; then
-					opensslincludedir="${openssldir}/include/openssl"
-				else
-					opensslincludedir="${openssldir}/include"
-				fi
+				opensslincludedir="${openssldir}/include"
 			else
 				opensslincludedir=''
 			fi
 
 
@@ -9214,11 +9210,11 @@
 printf %s "checking for OpenSSL include directory... " >&6; }
 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $opensslincludedir" >&5
 printf "%s\n" "$opensslincludedir" >&6; }
 
 		if test ! -z "$opensslincludedir"; then
-		if test -f "$opensslincludedir/ssl.h"; then
+		if test -f "$opensslincludedir/openssl/ssl.h"; then
 			TCLTLS_SSL_CFLAGS="-I$opensslincludedir"
 			TCLTLS_SSL_INCLUDES="-I$opensslincludedir"
 			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ssl.h" >&5
 printf %s "checking for ssl.h... " >&6; }
 			{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5