diff --git a/net/py-eventlet/Makefile b/net/py-eventlet/Makefile
index cb744678b1ba..809a679d5df8 100644
--- a/net/py-eventlet/Makefile
+++ b/net/py-eventlet/Makefile
@@ -1,27 +1,26 @@
 # Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
 
 PORTNAME=	eventlet
-PORTVERSION=	0.20.1
-PORTREVISION=	1
+PORTVERSION=	0.21.0
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	cs@FreeBSD.org
+MAINTAINER=	mmokhi@FreeBSD.org
 COMMENT=	Concurrent networking library for Python
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}greenlet>=0.3:devel/py-greenlet \
 		${PYTHON_PKGNAMEPREFIX}enum-compat>=0.0.2:devel/py-enum-compat \
 		${PYTHON_PKGNAMEPREFIX}enum34>=1.1.6:devel/py-enum34
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 USES=		python
 USE_PYTHON=	distutils autoplist
 
 regression-test: build
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
 
 .include <bsd.port.mk>
diff --git a/net/py-eventlet/distinfo b/net/py-eventlet/distinfo
index 86b2d9bdf9fa..b86f65d456ae 100644
--- a/net/py-eventlet/distinfo
+++ b/net/py-eventlet/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488401126
-SHA256 (eventlet-0.20.1.tar.gz) = 3ad581b8645a54acf436e62a4d8cbf229a1ec7bfa3287c160f0258826b297838
-SIZE (eventlet-0.20.1.tar.gz) = 469509
+TIMESTAMP = 1499080792
+SHA256 (eventlet-0.21.0.tar.gz) = 08faffab88c1b08bd53ea28bf084a572c89f7e7648bd9d71e6116ac17a51a15d
+SIZE (eventlet-0.21.0.tar.gz) = 484191
diff --git a/net/py-eventlet/files/patch-eventlet_support_greendns.py b/net/py-eventlet/files/patch-eventlet_support_greendns.py
deleted file mode 100644
index 695b2e30077a..000000000000
--- a/net/py-eventlet/files/patch-eventlet_support_greendns.py
+++ /dev/null
@@ -1,27 +0,0 @@
---- eventlet/support/greendns.py.orig	2017-03-29 21:00:19 UTC
-+++ eventlet/support/greendns.py
-@@ -79,8 +79,14 @@ DNS_QUERY_TIMEOUT = 10.0
- HOSTS_TTL = 10.0
- 
- EAI_EAGAIN_ERROR = socket.gaierror(socket.EAI_AGAIN, 'Lookup timed out')
--EAI_NODATA_ERROR = socket.gaierror(socket.EAI_NODATA, 'No address associated with hostname')
- EAI_NONAME_ERROR = socket.gaierror(socket.EAI_NONAME, 'Name or service not known')
-+# EAI_NODATA was removed from RFC3493, it's now replaced with EAI_NONAME
-+# socket.EAI_NODATA is not defined on FreeBSD, probably on some other platforms too.
-+# https://lists.freebsd.org/pipermail/freebsd-ports/2003-October/005757.html
-+EAI_NODATA_ERROR = EAI_NONAME_ERROR
-+if (os.environ.get('EVENTLET_DEPRECATED_EAI_NODATA', '').lower() in ('1', 'y', 'yes')
-+        and hasattr(socket, 'EAI_NODATA')):
-+    EAI_NODATA_ERROR = socket.gaierror(socket.EAI_NODATA, 'No address associated with hostname')
- 
- 
- def is_ipv4_addr(host):
-@@ -448,7 +454,7 @@ def _getaddrinfo_lookup(host, family, fl
-             try:
-                 answer = resolve(host, qfamily, False)
-             except socket.gaierror as e:
--                if e.errno not in (socket.EAI_AGAIN, socket.EAI_NODATA):
-+                if e.errno not in (socket.EAI_AGAIN, EAI_NONAME_ERROR.errno, EAI_NODATA_ERROR.errno):
-                     raise
-                 err = e
-             else: