diff --git a/.gitignore b/.gitignore
index b690508..c3ff5ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ eventlet-0.9.9.tar.gz
 /eventlet-0.22.1.tar.gz
 /eventlet-0.23.0.tar.gz
 /eventlet-0.24.1.tar.gz
+/eventlet-0.25.0.tar.gz
diff --git a/python-eventlet.spec b/python-eventlet.spec
index ae21e24..a602b24 100644
--- a/python-eventlet.spec
+++ b/python-eventlet.spec
@@ -2,16 +2,13 @@
 %{?python_enable_dependency_generator}
 
 Name:           python-%{modname}
-Version:        0.24.1
-Release:        4%{?dist}
+Version:        0.25.0
+Release:        1%{?dist}
 Summary:        Highly concurrent networking library
 License:        MIT
 URL:            http://eventlet.net
 Source0:        %{pypi_source %{modname}}
 
-# Python 3.7 support
-Patch0:         https://github.com/eventlet/eventlet/pull/506.patch#/python37.patch
-
 BuildArch:      noarch
 
 %description
@@ -112,6 +109,9 @@ nosetests-%{python3_version} -v
 %doc html-3
 
 %changelog
+* Tue May 28 2019 Kevin Fenzi <kevin@scrye.com> - 0.25.0-1
+- Update to 0.25.0. Fixes bug #1713639
+
 * Sat Mar 09 2019 Kevin Fenzi <kevin@scrye.com> - 0.24.1-4
 - Drop python2-eventlet-doc subpackage as python2-sphinx is going away.
 
diff --git a/python37.patch b/python37.patch
deleted file mode 100644
index 62816ba..0000000
--- a/python37.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 0d4e7bcb90800d6700b2c81c41c9770ee5f94358 Mon Sep 17 00:00:00 2001
-From: Marcel Plch <mplch@redhat.com>
-Date: Mon, 9 Jul 2018 16:45:45 +0200
-Subject: [PATCH] Fix for Python 3.7
-
----
- eventlet/green/ssl.py | 46 ++++++++++++++++++++++++++++++++++++++++------
- tests/debug_test.py   | 14 ++++++++++++--
- tests/hub_test.py     |  4 +++-
- 3 files changed, 55 insertions(+), 9 deletions(-)
-
-diff --git a/eventlet/green/ssl.py b/eventlet/green/ssl.py
-index 53ee9a3c..df72869e 100644
---- a/eventlet/green/ssl.py
-+++ b/eventlet/green/ssl.py
-@@ -24,6 +24,7 @@
-     'create_default_context', '_create_default_https_context']
- 
- _original_sslsocket = __ssl.SSLSocket
-+_original_wrap_socket = __ssl.wrap_socket
- 
- 
- class GreenSSLSocket(_original_sslsocket):
-@@ -57,11 +58,41 @@ def __init__(self, sock, keyfile=None, certfile=None,
-             # this assignment
-             self._timeout = sock.gettimeout()
- 
--        # nonblocking socket handshaking on connect got disabled so let's pretend it's disabled
--        # even when it's on
--        super(GreenSSLSocket, self).__init__(
--            sock.fd, keyfile, certfile, server_side, cert_reqs, ssl_version,
--            ca_certs, do_handshake_on_connect and six.PY2, *args, **kw)
-+        if sys.version_info >= (3, 7):
-+            # Monkey-patch the sslsocket so our modified self gets
-+            # injected into its _create method.
-+            def fake_new(self, cls, *args, **kwargs):
-+                return self
-+
-+            orig_new = _original_sslsocket.__new__
-+            try:
-+                _original_sslsocket.__new__ = fake_new.__get__(self, GreenSSLSocket)
-+
-+                self = _original_wrap_socket(
-+                    sock=sock.fd,
-+                    keyfile=keyfile,
-+                    certfile=certfile,
-+                    server_side=server_side,
-+                    cert_reqs=cert_reqs,
-+                    ssl_version=ssl_version,
-+                    ca_certs=ca_certs,
-+                    do_handshake_on_connect=do_handshake_on_connect and six.PY2,
-+                    *args, **kw
-+                )
-+                self.keyfile = keyfile
-+                self.certfile = certfile
-+                self.cert_reqs = cert_reqs
-+                self.ssl_version = ssl_version
-+                self.ca_certs = ca_certs
-+            finally:
-+                # Unpatch
-+                _original_sslsocket.__new__ = orig_new
-+        else:
-+            # nonblocking socket handshaking on connect got disabled so let's pretend it's disabled
-+            # even when it's on
-+            super(GreenSSLSocket, self).__init__(
-+                sock.fd, keyfile, certfile, server_side, cert_reqs, ssl_version,
-+                ca_certs, do_handshake_on_connect and six.PY2, *args, **kw)
- 
-         # the superclass initializer trashes the methods so we remove
-         # the local-object versions of them and let the actual class
-@@ -323,7 +354,10 @@ def connect(self, addr):
-         except NameError:
-             self._sslobj = sslobj
-         else:
--            self._sslobj = SSLObject(sslobj, owner=self)
-+            if sys.version_info < (3, 7):
-+                self._sslobj = SSLObject(sslobj, owner=self)
-+            else:
-+                self._sslobj = sslobj
- 
-         if self.do_handshake_on_connect:
-             self.do_handshake()
-diff --git a/tests/debug_test.py b/tests/debug_test.py
-index 8299dede..82b3a834 100644
---- a/tests/debug_test.py
-+++ b/tests/debug_test.py
-@@ -29,6 +29,11 @@ def test_unspew(self):
-         assert self.tracer is None
- 
-     def test_line(self):
-+        if sys.version_info >= (3, 7):
-+            frame_str = "f=<frame at"
-+        else:
-+            frame_str = "f=<frame object at"
-+
-         sys.stdout = six.StringIO()
-         s = debug.Spew()
-         f = sys._getframe()
-@@ -36,7 +41,7 @@ def test_line(self):
-         lineno = f.f_lineno - 1  # -1 here since we called with frame f in the line above
-         output = sys.stdout.getvalue()
-         assert "%s:%i" % (__name__, lineno) in output, "Didn't find line %i in %s" % (lineno, output)
--        assert "f=<frame object at" in output
-+        assert frame_str in output
- 
-     def test_line_nofile(self):
-         sys.stdout = six.StringIO()
-@@ -51,6 +56,11 @@ def test_line_nofile(self):
-         assert "VM instruction #" in output, output
- 
-     def test_line_global(self):
-+        if sys.version_info >= (3, 7):
-+            frame_str = "f=<frame at"
-+        else:
-+            frame_str = "f=<frame object at"
-+
-         global GLOBAL_VAR
-         sys.stdout = six.StringIO()
-         GLOBAL_VAR = debug.Spew()
-@@ -59,7 +69,7 @@ def test_line_global(self):
-         lineno = f.f_lineno - 1  # -1 here since we called with frame f in the line above
-         output = sys.stdout.getvalue()
-         assert "%s:%i" % (__name__, lineno) in output, "Didn't find line %i in %s" % (lineno, output)
--        assert "f=<frame object at" in output
-+        assert frame_str in output
-         assert "GLOBAL_VAR" in f.f_globals
-         assert "GLOBAL_VAR=<eventlet.debug.Spew object at" in output
-         del GLOBAL_VAR
-diff --git a/tests/hub_test.py b/tests/hub_test.py
-index 61b5b0b9..024f7a52 100644
---- a/tests/hub_test.py
-+++ b/tests/hub_test.py
-@@ -400,4 +400,6 @@ def fail_import(name, *args, **kwargs):
- '''
-         self.write_to_tempfile('newmod', module_source)
-         output, _ = self.launch_subprocess('newmod.py')
--        self.assertEqual(output, 'kqueue tried\nok\n')
-+        # Should be equal, but this will do until
-+        # the imp deprecation warning is fixed.
-+        self.assertTrue(output.endswith('kqueue tried\nok\n'))
diff --git a/sources b/sources
index 5e9e5da..6a65e87 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (eventlet-0.24.1.tar.gz) = 867f8ead3a6c0dd692c5cc5d9f1181b04456bdb270ea95d84f7f97da4603b333df539721cda002437c035fac51134bee8cc3495e09b6a25ae1c46fdaf015d0c3
+SHA512 (eventlet-0.25.0.tar.gz) = f42549ecc6ca6833d611dc178593e69ff0d63881111fe7f9357b26c602a57dccbbc53101b86ed01e1e2b4a201afa8d170ade1052fcec36aab8776c56a8a15b42