diff --git a/www/py-scrapy/Makefile b/www/py-scrapy/Makefile
index 8abedc76b161..6527fdb02154 100644
--- a/www/py-scrapy/Makefile
+++ b/www/py-scrapy/Makefile
@@ -1,35 +1,39 @@
 # Created by: Qing Feng <qingfeng@douban.com>
 
 PORTNAME=	Scrapy
-DISTVERSION=	1.6.0
-PORTREVISION=	2
+DISTVERSION=	2.5.0
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	High level scraping and web crawling framework
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=13.1.0:devel/py-twisted@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=2.0:security/py-cryptography@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cssselect>=0.9.1:www/py-cssselect@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}itemloaders>=1.0.1:devel/py-itemloaders@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}parsel>=1.5:textproc/py-parsel@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}openssl>=16.2.0:security/py-openssl@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}queuelib>=1.4.2:sysutils/py-queuelib@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}w3lib>=1.17.0:www/py-w3lib@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}cssselect>=0.9:www/py-cssselect@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}queuelib>0:sysutils/py-queuelib@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pydispatcher>=2.0.5:devel/py-pydispatcher@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}service_identity>0:security/py-service_identity@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}parsel>=1.5:textproc/py-parsel@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.3:devel/py-zope.interface@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}protego>=0.1.15:www/py-protego@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}itemadapter>=0.1.0:devel/py-itemadapter@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>=3.5.0:devel/py-lxml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pydispatcher>=2.0.5:devel/py-pydispatcher@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils concurrent autoplist
 
-OPTIONS_DEFINE=		SSL
-OPTIONS_DEFAULT=	SSL
+NO_ARCH=	yes
 
-SSL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR}
+# Remove experimental HTTP/2 support, issues with Twisted and h2
+post-extract:
+	@${RM} -r ${WRKSRC}/scrapy/core/http2
+	@${RM}  ${WRKSRC}/scrapy/core/downloader/handlers/http2.py
 
 .include <bsd.port.mk>
diff --git a/www/py-scrapy/distinfo b/www/py-scrapy/distinfo
index d83923a10cae..a5f52400e87d 100644
--- a/www/py-scrapy/distinfo
+++ b/www/py-scrapy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549229032
-SHA256 (Scrapy-1.6.0.tar.gz) = 558dfd10ac53cb324ecd7eefd3eac412161c7507c082b01b0bcd2c6e2e9f0766
-SIZE (Scrapy-1.6.0.tar.gz) = 926576
+TIMESTAMP = 1622321274
+SHA256 (Scrapy-2.5.0.tar.gz) = 0a68ed41f7173679f160c4cef2db05288548c21e7164170552adae8b13cefaab
+SIZE (Scrapy-2.5.0.tar.gz) = 1071824
diff --git a/www/py-scrapy/files/patch-setup.py b/www/py-scrapy/files/patch-setup.py
new file mode 100644
index 000000000000..8571812fecc3
--- /dev/null
+++ b/www/py-scrapy/files/patch-setup.py
@@ -0,0 +1,19 @@
+# Remove experimental HTTP/2 support, issues with Twisted and h2
+--- setup.py.orig	2021-04-06 14:48:02 UTC
++++ setup.py
+@@ -19,7 +19,6 @@ def has_environment_marker_platform_impl_support():
+ 
+ 
+ install_requires = [
+-    'Twisted[http2]>=17.9.0',
+     'cryptography>=2.0',
+     'cssselect>=0.9.1',
+     'itemloaders>=1.0.1',
+@@ -31,7 +30,6 @@ install_requires = [
+     'zope.interface>=4.1.3',
+     'protego>=0.1.15',
+     'itemadapter>=0.1.0',
+-    'h2>=3.0,<4.0',
+ ]
+ extras_require = {}
+ cpython_dependencies = [
diff --git a/www/py-scrapy/pkg-descr b/www/py-scrapy/pkg-descr
index 01e275464787..3da8287b29bf 100644
--- a/www/py-scrapy/pkg-descr
+++ b/www/py-scrapy/pkg-descr
@@ -1,5 +1,5 @@
-Scrapy is a high level scraping and web crawling framework for writing
-spiders to crawl and parse web pages for all kinds of purposes, from
-information retrieval to monitoring or testing web sites.
+Scrapy is a fast high-level web crawling and web scraping framework, used to
+crawl websites and extract structured data from their pages. It can be used for
+a wide range of purposes, from data mining to monitoring and automated testing.
 
 WWW: https://scrapy.org/