diff --git a/limit-error-messages.patch b/limit-error-messages.patch
new file mode 100644
index 0000000..b6446ca
--- /dev/null
+++ b/limit-error-messages.patch
@@ -0,0 +1,23 @@
+From e0826a2ec69bc3cf71ba7ca7945774d9213d7d5e Mon Sep 17 00:00:00 2001
+From: Kyle Sunden <git@ksunden.space>
+Date: Wed, 5 Jul 2023 14:16:50 -0500
+Subject: [PATCH] Limit error message overriding when
+
+---
+ pyparsing/core.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/pyparsing/core.py b/pyparsing/core.py
+index 8233f72c..bfbb391c 100644
+--- a/pyparsing/core.py
++++ b/pyparsing/core.py
+@@ -4547,7 +4547,8 @@ def parseImpl(self, instring, loc, doActions=True):
+             try:
+                 return self.expr._parse(instring, loc, doActions, callPreParse=False)
+             except ParseBaseException as pbe:
+-                pbe.msg = self.errmsg
++                if not isinstance(self, Forward) or self.customName is not None:
++                    pbe.msg = self.errmsg
+                 raise
+         else:
+             raise ParseException(instring, loc, "No expression defined", self)
diff --git a/python-pyparsing.changes b/python-pyparsing.changes
index a264678..2853152 100644
--- a/python-pyparsing.changes
+++ b/python-pyparsing.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 11 11:01:42 UTC 2023 - Markéta Machová <mmachova@suse.com>
+
+- Add upstream patch limit-error-messages.patch as a part of 
+  a workaround for boo#1213007
+
 -------------------------------------------------------------------
 Sat Jul  1 13:52:01 UTC 2023 - Markéta Machová <mmachova@suse.com>
 
diff --git a/python-pyparsing.spec b/python-pyparsing.spec
index 9aeb962..0fad56b 100644
--- a/python-pyparsing.spec
+++ b/python-pyparsing.spec
@@ -62,6 +62,8 @@ Summary:        Grammar Parser Library for Python
 License:        GPL-2.0-or-later AND MIT AND GPL-3.0-or-later
 URL:            https://github.com/pyparsing/pyparsing/
 Source:         https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-%{version}.tar.gz
+#PATCH-FIX-UPSTREAM https://github.com/pyparsing/pyparsing/pull/493 Limit error message overriding
+Patch:          limit-error-messages.patch
 BuildRequires:  %{python_module base}
 BuildRequires:  %{python_module flit-core}
 BuildRequires:  fdupes
@@ -91,6 +93,7 @@ code uses to construct the grammar directly in Python code.
 
 %prep
 %setup -q -n %{modname}-%{version}
+%autopatch -p1
 
 %if !%{with test}
 %build