diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2abd715732..e1a9bbbe2e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,7 +114,6 @@ endif ()
 
 include_directories(BEFORE
                     ${PCAP_INCLUDE_DIR}
-                    ${OPENSSL_INCLUDE_DIR}
                     ${BIND_INCLUDE_DIR}
                     ${BinPAC_INCLUDE_DIR}
                     ${ZLIB_INCLUDE_DIR}
@@ -164,6 +163,12 @@ if (ENABLE_PERFTOOLS_DEBUG OR ENABLE_PERFTOOLS)
     # perftools weren't found
 endif ()
 
+# Making sure any non-standard OpenSSL includes get searched earlier
+# than other dependencies which tend to be in standard system locations
+# and thus cause the system OpenSSL headers to still be picked up even
+# if one specifies --with-openssl (which may be common).
+include_directories(BEFORE ${OPENSSL_INCLUDE_DIR})
+
 set(brodeps
     ${BinPAC_LIBRARY}
     ${PCAP_LIBRARY}
diff --git a/cmake b/cmake
index 70fc7406f4..c8f07c6bf9 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 70fc7406f4baa87da9362c2b80ee6bbcdb242e0a
+Subproject commit c8f07c6bf90b472fb54b2ecbe0497238f40dec8a