diff --git a/CHANGES b/CHANGES
index e43a8887b1668f4d28e490c412d0b8559d66d388..bfe49f423560baacbedeb7174e5fb69916cffd77 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,11 @@
                                   Changelog
 
 
+Daniel Stenberg (10 Jun 2008)
+- I made the OpenSSL code build again with OpenSSL 0.9.6. The CRLFILE
+  functionality killed it due to its unconditional use of
+  X509_STORE_set_flags...
+
 Daniel Stenberg (8 Jun 2008)
 - Due to the three new libcurl changes and the massive command line option
   change I decided we'll mark it by bumping the next release number to 7.19.0!
diff --git a/lib/ssluse.c b/lib/ssluse.c
index 4fff13d78a418b1c0b22c244d4696a00f75e4277..f57828f881bc908949af96739b4fb8c31f991dc5 100644
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -108,6 +108,13 @@
 #define SSL_METHOD_QUAL
 #endif
 
+#if OPENSSL_VERSION_NUMBER >= 0x00907000L
+/* 0.9.6 didn't have X509_STORE_set_flags() */
+#define HAVE_X509_STORE_SET_FLAGS 1
+#else
+#define X509_STORE_set_flags(x,y)
+#endif
+
 /*
  * Number of bytes to read from the random number seed file. This must be
  * a finite value (because some entropy "files" like /dev/urandom have