diff --git a/0006-Fix-mandoc-invocation-to-not-produce-garbage.patch b/0006-Fix-mandoc-invocation-to-not-produce-garbage.patch
new file mode 100644
index 0000000..fb105df
--- /dev/null
+++ b/0006-Fix-mandoc-invocation-to-not-produce-garbage.patch
@@ -0,0 +1,32 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Thu, 7 Jul 2022 16:56:41 -0400
+Subject: [PATCH] Fix mandoc invocation to not produce garbage
+
+Bizarrely, mandoc doesn't default to outputting man - the default is
+"locale", which is either ASCII or UTF-8 (by locale).  This output is
+supposed to be some kind of plain-text, but it's formatted so strangely
+I'm not sure what the purpose is.  Regardless, it doesn't go well to
+feed this into man(1).
+
+Tell mandoc explicitly to produce man pages.
+
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+(cherry picked from commit 102c3d1d81c090750abb3815481d5cfd3e596677)
+---
+ Make.rules | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Make.rules b/Make.rules
+index 12e322b..f6bf5fa 100644
+--- a/Make.rules
++++ b/Make.rules
+@@ -54,7 +54,7 @@ define substitute-version =
+ endef
+ 
+ %.1 : %.1.mdoc
+-	@mandoc -man -Ios=Linux $^ > $@
++	@mandoc -man -T man -Ios=Linux $^ > $@
+ 
+ % : %.in
+ 	@$(call substitute-version,$<,$@)
diff --git a/pesign.patches b/pesign.patches
index 848483a..9b257c3 100644
--- a/pesign.patches
+++ b/pesign.patches
@@ -3,3 +3,4 @@ Patch0002: 0002-Fix-building-signed-kernels-on-setups-other-than-koj.patch
 Patch0003: 0003-Add-D_GLIBCXX_ASSERTIONS-to-CPPFLAGS.patch
 Patch0004: 0004-macros.pesign-handle-centos-like-rhel-with-rhelver.patch
 Patch0005: 0005-Detect-the-presence-of-rpm-sign-when-checking-for-rh.patch
+Patch0006: 0006-Fix-mandoc-invocation-to-not-produce-garbage.patch
diff --git a/pesign.spec b/pesign.spec
index 483a42d..b850722 100644
--- a/pesign.spec
+++ b/pesign.spec
@@ -6,7 +6,7 @@
 Name:    pesign
 Summary: Signing utility for UEFI binaries
 Version: 115
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL-2.0-only
 URL:     https://github.com/rhboot/pesign
 
@@ -161,6 +161,10 @@ certutil -d %{_sysconfdir}/pki/pesign/ -X -L > /dev/null
 %{python3_sitelib}/mockbuild/plugins/pesign.*
 
 %changelog
+* Thu Jul 07 2022 Robbie Harwood <rharwood@redhat.com> - 115-6
+- Fix formatting of man pages
+- Resolves: #2104778
+
 * Mon Apr 04 2022 Robbie Harwood <rharwood@redhat.com> - 115-5
 - Detect presence of rpm-sign when checking for rhel-ness