diff --git a/databases/py-ormar/Makefile b/databases/py-ormar/Makefile
index b1194f251134..a46b4cfe354e 100644
--- a/databases/py-ormar/Makefile
+++ b/databases/py-ormar/Makefile
@@ -1,54 +1,61 @@
 PORTNAME=	ormar
-DISTVERSION=	0.12.2
+DISTVERSION=	0.20.0
 CATEGORIES=	databases python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	meka@tilda.center
 COMMENT=	Simple async ORM with fastapi in mind and pydantic validation
 WWW=		https://github.com/collerek/ormar
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}databases>=0.3.2,<0.9.0:databases/py-databases@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pydantic>=1.6.1,<1.11.0,1:devel/py-pydantic@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}databases>=0.3.2,<0.9.0:databases/py-databases@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pydantic-extra-types>=0:devel/py-pydantic-extra-types@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pydantic2>=0:devel/py-pydantic2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=1.4.0:databases/py-sqlalchemy14@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.7:devel/py-typing-extensions@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fastapi>=0:www/py-fastapi@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest-benchmark>=0:devel/py-pytest-benchmark@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}poetry>=0:devel/py-poetry@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}nest-asyncio>=0:devel/py-nest-asyncio@${PY_FLAVOR} \
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asgi-lifespan>=0:devel/py-asgi-lifespan@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}async_timeout>0:devel/py-async_timeout@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}asyncpg>=0:databases/py-asyncpg@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}fastapi>=0:www/py-fastapi@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}httpx>=0:www/py-httpx@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}nest-asyncio>=0:devel/py-nest-asyncio@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}poetry>=0:devel/py-poetry@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pymysql>=0:databases/py-pymysql@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}asgi-lifespan>=0:devel/py-asgi-lifespan@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}httpx>=0:www/py-httpx@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-benchmark>=0:devel/py-pytest-benchmark@${PY_FLAVOR}
 
 USES=		python
 USE_GITHUB=	YES
 USE_PYTHON=	autoplist concurrent pep517 pytest
 GH_ACCOUNT=	collerek
 PEP517_BUILD_DEPEND=	${PYTHON_PKGNAMEPREFIX}poetry>=0:devel/py-poetry@${PY_FLAVOR}
 
-TEST_ENV=	PYTHONPATH=${WRKSRC}/src
-
+TEST_ENV=	PYTHONPATH=${WRKSRC}
 NO_ARCH=	yes
+PYTEST_BROKEN_TESTS=	test_read_main test_signal_functions \
+			test_multiple_signals test_static_methods_as_signals \
+			test_methods_as_signals test_multiple_senders_signal \
+			test_modifing_the_instance test_custom_signal \
+			test_relation_signal_functions
 
 OPTIONS_DEFINE=			CRYPTO
 OPTIONS_GROUP=			DATABASES
 OPTIONS_GROUP_DATABASES=	MYSQL PGSQL SQLITE
 OPTIONS_DEFAULT=		SQLITE
 DATABASES_DESC=			Database Support
 
 CRYPTO_DESC=		Support for password encryption
 CRYPTO_USE=		PYTHON=cryptography
 SQLITE_USES=		sqlite
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiosqlite>0:databases/py-aiosqlite@${PY_FLAVOR}
 MYSQL_USES=		mysql
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiomysql>0:databases/py-aiomysql@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pymysql>0:databases/py-pymysql@${PY_FLAVOR}
 PGSQL_USES=		pgsql
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asyncpg>0:databases/py-asyncpg@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/databases/py-ormar/distinfo b/databases/py-ormar/distinfo
index 364d6533697d..78d78505e3f9 100644
--- a/databases/py-ormar/distinfo
+++ b/databases/py-ormar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1696062965
-SHA256 (collerek-ormar-0.12.2_GH0.tar.gz) = dc67369d2eff330655adc30ff4ba84fc6c56421b233142e3c8306eb19d6a2fc0
-SIZE (collerek-ormar-0.12.2_GH0.tar.gz) = 375209
+TIMESTAMP = 1710767351
+SHA256 (collerek-ormar-0.20.0_GH0.tar.gz) = 7e00fdefce42ebd19836599645f299fc75ab27ca0ad1f385b4007cd6aefac4c5
+SIZE (collerek-ormar-0.20.0_GH0.tar.gz) = 381644
diff --git a/databases/py-ormar/files/patch-benchmarks_test__benchmark__init.py b/databases/py-ormar/files/patch-benchmarks_test__benchmark__init.py
deleted file mode 100644
index 3f7ee1af73c8..000000000000
--- a/databases/py-ormar/files/patch-benchmarks_test__benchmark__init.py
+++ /dev/null
@@ -1,15 +0,0 @@
---- benchmarks/test_benchmark_init.py.orig	2023-10-04 07:21:13 UTC
-+++ benchmarks/test_benchmark_init.py
-@@ -1,3 +1,4 @@
-+import asyncio
- import random
- import string
- 
-@@ -20,6 +21,7 @@ async def test_initializing_models(aio_benchmark, num_
-             for i in range(0, num_models)
-         ]
-         assert len(authors) == num_models
-+        return asyncio.sleep(0)
- 
-     await initialize_models(num_models)
-