diff --git a/ChangeLog b/ChangeLog
index 7a0e146d..74183177 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-08  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* configure.in: When checking for OpenSSL headers, check for all
+	the ones that Wget is using.
+
 2005-04-08  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* windows/Makefile.src: Compile ptimer.c and http-ntlm.c.
diff --git a/configure.in b/configure.in
index d0ec4b4b..becfba3c 100644
--- a/configure.in
+++ b/configure.in
@@ -327,10 +327,20 @@ if test x"$with_ssl" != x"no"; then
     ssl_found_includes=no
     CPPFLAGS="$SSL_INCLUDES $wget_save_CPPFLAGS"
 
+    dnl Check for all the OpenSSL includes that Wget actually uses.
+    dnl This will prune both invalid installations and ancient
+    dnl versions of OpenSSL that we can't use.
     AC_MSG_CHECKING([for includes])
     AC_COMPILE_IFELSE([
 #include <openssl/ssl.h>
-#include <openssl/rsa.h>
+#include <openssl/bio.h>
+#include <openssl/crypto.h>
+#include <openssl/des.h>
+#include <openssl/err.h>
+#include <openssl/md4.h>
+#include <openssl/pem.h>
+#include <openssl/rand.h>
+#include <openssl/x509.h>
     ], [
       AC_MSG_RESULT(found)
       ssl_found_includes=yes