--- configure.ac.orig	2015-05-23 16:09:25 UTC
+++ configure.ac
@@ -2224,9 +2218,6 @@ AC_MSG_RESULT($SHLIBS)
 # checks for libraries
 AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
 AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX
-AC_CHECK_LIB(crypto, RAND_egd,
-             AC_DEFINE(HAVE_RAND_EGD, 1,
-             [Define if the libcrypto has RAND_egd]))
 
 # only check for sem_init if thread support is requested
 if test "$with_threads" = "yes" -o -z "$with_threads"; then
--- Modules/_ssl.c.orig	2015-05-23 16:09:19 UTC
+++ Modules/_ssl.c
@@ -3380,7 +3380,7 @@ using the ssl() function.");
 #endif /* HAVE_OPENSSL_RAND */
 
 
-#ifdef HAVE_RAND_EGD
+#ifndef OPENSSL_NO_EGD
 
 static PyObject *
 PySSL_RAND_egd(PyObject *self, PyObject *arg)
@@ -3804,7 +3804,7 @@ static PyMethodDef PySSL_methods[] = {
     {"RAND_status",         (PyCFunction)PySSL_RAND_status, METH_NOARGS,
      PySSL_RAND_status_doc},
 #endif
-#ifdef HAVE_RAND_EGD
+#ifndef OPENSSL_NO_EGD
     {"RAND_egd",            PySSL_RAND_egd, METH_VARARGS,
      PySSL_RAND_egd_doc},
 #endif