diff --git a/databases/py-queries/Makefile b/databases/py-queries/Makefile
index 8e772ca5df47..0bb320f365b8 100644
--- a/databases/py-queries/Makefile
+++ b/databases/py-queries/Makefile
@@ -1,22 +1,23 @@
 # Created by: Grzegorz Blach <gblach@FreeBSD.org>
 
 PORTNAME=	queries
 PORTVERSION=	2.1.0
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Simplified PostgreSQL client built upon Psycopg2
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.1<2.9:databases/py-psycopg2@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.1<3:databases/py-psycopg2@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/py-queries/files/patch-setup.py b/databases/py-queries/files/patch-setup.py
new file mode 100644
index 000000000000..817559c5582e
--- /dev/null
+++ b/databases/py-queries/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	2020-03-09 17:39:51 UTC
++++ setup.py
+@@ -7,7 +7,7 @@ import setuptools
+ if platform.python_implementation() == 'PyPy':
+     install_requires = ['psycopg2cffi>=2.7.2,<2.9']
+ else:
+-    install_requires = ['psycopg2>=2.5.1,<2.9']
++    install_requires = ['psycopg2>=2.5.1,<3']
+ 
+ # Install tornado if generating docs on readthedocs
+ if os.environ.get('READTHEDOCS', None) == 'True':