diff --git a/no_decl_class_registry.patch b/no_decl_class_registry.patch
new file mode 100644
index 0000000..076bdf5
--- /dev/null
+++ b/no_decl_class_registry.patch
@@ -0,0 +1,19 @@
+---
+ sortinghat/db/database.py |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/sortinghat/db/database.py
++++ b/sortinghat/db/database.py
+@@ -258,7 +258,7 @@ def reflect_table(engine, klass):
+ def find_model_by_table_name(name):
+     """Find a model reference by its table name"""
+ 
+-    for model in ModelBase._decl_class_registry.values():
+-        if hasattr(model, '__table__') and model.__table__.fullname == name:
+-            return model
+-    return None
+\ No newline at end of file
++    for value in ModelBase.registry._class_registry.values():
++        if getattr(value, '__tablename__', None) == name:
++            return value
++    return None
diff --git a/python-sortinghat.changes b/python-sortinghat.changes
index 8f78b52..466df6f 100644
--- a/python-sortinghat.changes
+++ b/python-sortinghat.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Aug  5 15:20:24 UTC 2021 - Matej Cepl <mcepl@suse.com>
+
+- Add no_decl_class_registry.patch to make the package compatible
+  with SQLAlchemy 1.4 (gh#chaoss/grimoirelab-sortinghat#579).
+
 -------------------------------------------------------------------
 Thu May 27 12:39:34 UTC 2021 - Matej Cepl <mcepl@suse.com>
 
diff --git a/python-sortinghat.spec b/python-sortinghat.spec
index fadbfc7..99ff336 100644
--- a/python-sortinghat.spec
+++ b/python-sortinghat.spec
@@ -29,6 +29,9 @@ License:        GPL-3.0-only
 Group:          Development/Languages/Python
 URL:            https://github.com/grimoirelab/sortinghat
 Source0:        https://files.pythonhosted.org/packages/source/s/sortinghat/sortinghat-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM no_decl_class_registry.patch gh#chaoss/grimoirelab-sortinghat#579 mcepl@suse.com
+# make the package compatible with SQLAlchemy 1.4.*
+Patch0:         no_decl_class_registry.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros