diff --git a/man-db-2.13.1-lexgrog.l-Increase-MAX_NAME-to-16384.patch b/man-db-2.13.1-lexgrog.l-Increase-MAX_NAME-to-16384.patch
new file mode 100644
index 0000000..54ea7be
--- /dev/null
+++ b/man-db-2.13.1-lexgrog.l-Increase-MAX_NAME-to-16384.patch
@@ -0,0 +1,28 @@
+From 2da9562c194d520d38978f66bde7ef25d863d8a5 Mon Sep 17 00:00:00 2001
+From: Jake Dane <12311737-jakedane@users.noreply.gitlab.com>
+Date: Mon, 21 Apr 2025 06:40:14 +0000
+Subject: [PATCH] lexgrog.l: Increase MAX_NAME to 16384
+
+Since some manual pages with NAME sections exceeding 8192 bytes have
+been observed in the wild (Debian bug #1102453), increase MAX_NAME to
+16384.
+---
+ src/lexgrog.l | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lexgrog.l b/src/lexgrog.l
+index 6df2c182..1a2e13be 100644
+--- a/src/lexgrog.l
++++ b/src/lexgrog.l
+@@ -71,7 +71,7 @@
+ #include "manconv_client.h"
+ 
+ #define YY_READ_BUF_SIZE	1024
+-#define MAX_NAME		8192
++#define MAX_NAME		16384
+ 
+ /* defines the ordered list of filters detected by lexgrog */
+ enum {
+-- 
+2.49.0
+
diff --git a/man-db.spec b/man-db.spec
index ed9926d..5a944c9 100644
--- a/man-db.spec
+++ b/man-db.spec
@@ -3,7 +3,7 @@
 Summary: Tools for searching and reading man pages
 Name: man-db
 Version: 2.12.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 # GPLv2+ .. man-db
 # GPLv3+ .. gnulib
 License: GPL-2.0-or-later AND GPL-3.0-or-later
@@ -39,6 +39,9 @@ Requires(post): %{_sbindir}/update-alternatives
 Requires(postun): %{_sbindir}/update-alternatives
 Requires(preun): %{_sbindir}/update-alternatives
 
+# Upstream patch: https://gitlab.com/man-db/man-db/-/commit/2da9562c194d520d38978f66bde7ef25d863d8a5
+Patch0001: man-db-2.13.1-lexgrog.l-Increase-MAX_NAME-to-16384.patch
+
 %description
 The man-db package includes five tools for browsing man-pages:
 man, whatis, apropos, manpath and lexgrog. man formats and displays
@@ -234,6 +237,10 @@ fi
 %config(noreplace) %{_sysconfdir}/cron.daily/man-db.cron
 
 %changelog
+* Tue May 27 2025 Lukas Javorsky <ljavorsk@redhat.com> - 2.12.0-9
+- Increase MAX_NAME to 16384
+- Resolves: RHEL-93654
+
 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.12.0-8
 - Bump release for October 2024 mass rebuild:
   Resolves: RHEL-64018