diff --git a/ChangeLog b/ChangeLog
index 3cff96d5..5ae3edc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
+Fri Sep  6 10:00:44 CEST 2013
+	Improved check for proper OpenSSL version for
+	libmicrospdy. -CG
+
 Wed Sep  4 17:23:15 CEST 2013
-	Set IPV6_V6ONLY socket option correctly when IPv6 is 
-	enabled (MHD_USE_IPv6) but not dual stack 
+	Set IPV6_V6ONLY socket option correctly when IPv6 is
+	enabled (MHD_USE_IPv6) but not dual stack
 	(MHD_USE_DUAL_STACK) -MW
+
 Mon Sep  2 22:59:45 CEST 2013
 	Fix use-after-free in epoll()-mode on read error.
 	Releasing libmicrohttpd 0.9.30. -CG
diff --git a/configure.ac b/configure.ac
index 9e22a881..72f17957 100644
--- a/configure.ac
+++ b/configure.ac
@@ -337,8 +337,11 @@ AC_MSG_RESULT($enable_spdy)
 if test "$enable_spdy" = "yes"
 then
  AC_CHECK_HEADERS([openssl/err.h], 
-                   [AM_CONDITIONAL(HAVE_OPENSSL, true)
-                   enable_spdy="yes"], 
+                   AC_CHECK_LIB(crypto, SSL_CTX_set_next_protos_advertised_cb,
+                    [AM_CONDITIONAL(HAVE_OPENSSL, true)
+                     enable_spdy="yes"], 
+                    [AM_CONDITIONAL(HAVE_OPENSSL, false)
+                    enable_spdy="no"]),
                    [AM_CONDITIONAL(HAVE_OPENSSL, false)
                    enable_spdy="no"])
 else