diff --git a/devel/py-gyp/Makefile b/devel/py-gyp/Makefile
index ad2ffa3a7fa4..2eefdf628e41 100644
--- a/devel/py-gyp/Makefile
+++ b/devel/py-gyp/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	gyp
 PORTVERSION=	20200512
+PORTREVISION=	1
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Build System That Generates Other Build Systems
 WWW=		https://gyp.gsrc.io/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		python
 USE_GITHUB=	yes
 GH_ACCOUNT=	hrs-allbsd
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-gyp/files/patch-pylib_gyp_common.py b/devel/py-gyp/files/patch-pylib_gyp_common.py
new file mode 100644
index 000000000000..d712c8ddd0ae
--- /dev/null
+++ b/devel/py-gyp/files/patch-pylib_gyp_common.py
@@ -0,0 +1,23 @@
+--- pylib/gyp/common.py.orig	2020-05-12 14:59:53 UTC
++++ pylib/gyp/common.py
+@@ -12,6 +12,11 @@ import sys
+ import tempfile
+ import sys
+ 
++if sys.version_info.major == 3 and sys.version_info.minor >= 10:
++    from collections.abc import MutableSet
++    collections.MutableSet = collections.abc.MutableSet
++else:
++    from collections import MutableSet
+ 
+ # A minimal memoizing decorator. It'll blow up if the args aren't immutable,
+ # among other "problems".
+@@ -494,7 +499,7 @@ def uniquer(seq, idfun=None):
+ 
+ 
+ # Based on http://code.activestate.com/recipes/576694/.
+-class OrderedSet(collections.MutableSet):
++class OrderedSet(MutableSet):
+   def __init__(self, iterable=None):
+     self.end = end = []
+     end += [None, end, end]         # sentinel node for doubly linked list