diff --git a/main/mandoc/APKBUILD b/main/mandoc/APKBUILD
index ea1d100253a7d6bc99eba3d529b31ba9243e982e..1058e8da87187e59c28e08c395db2c42ef651870 100644
--- a/main/mandoc/APKBUILD
+++ b/main/mandoc/APKBUILD
@@ -19,6 +19,7 @@ source="https://mandoc.bsd.lv/snapshots/mandoc-$pkgver.tar.gz
 	outdated-warn-disable.patch
 	fix-tbl-null-pointer.patch
 	mandoc_configure.patch
+	simplify-compat.patch
 	"
 
 prepare() {
@@ -72,4 +73,5 @@ sha512sums="848f290847f3095757f25647e6d73eb7044018b145bf6f9dc8b5db164b1421911efd
 b1bd2c197584948cc8bab2310e759b8942b9f9479254ffb5a8223cfa6ba03c9e1a4d402c5440b8d9f962be9a020287d3dd8556592c17f2b46f15f405d9d373cb  shared-libmandoc.patch
 ced05e8b57fb9705c6d8d8570cd6b06ad187511a4c243ac2dbc34064aa164ca49e0c877160134161dcb98ebd5e61a5c23d5741f03ef95903ff56193dd07f36a1  outdated-warn-disable.patch
 bb46bc3a0f07881e5362b32d478632fb209f9740017c467f2258e9b7ddbece6175bba598287d8c24626c9ee7217eb92ae60e0a30aeafdfc4b0154f4d312cbcca  fix-tbl-null-pointer.patch
-a44d86fb012acbc05eb233122e7ca3170e5e01c7c49115c2fe83f49891d442ba94601a039018cfa01cc1ef3cd02d5aff4d1e01abd4230b8bc2091e649ad991db  mandoc_configure.patch"
+a44d86fb012acbc05eb233122e7ca3170e5e01c7c49115c2fe83f49891d442ba94601a039018cfa01cc1ef3cd02d5aff4d1e01abd4230b8bc2091e649ad991db  mandoc_configure.patch
+0979e8ee20d6163669f7ab3ace1f959ba9d831c208785c3522261c72ddc2f60ce8420ed36ea963c46a72b9ffdbcb9199da436b13e14c0ca4d938351d170adfa7  simplify-compat.patch"
diff --git a/main/mandoc/simplify-compat.patch b/main/mandoc/simplify-compat.patch
new file mode 100644
index 0000000000000000000000000000000000000000..d50be17fa7c9ffd839ea49efd92aa982ee29519c
--- /dev/null
+++ b/main/mandoc/simplify-compat.patch
@@ -0,0 +1,275 @@
+Upstream: Unknown, taken from Fedora
+Reason: Fixes compilation with gcc-10
+
+diff -up mandoc-1.14.5/compat_err.c.orig mandoc-1.14.5/compat_err.c
+--- mandoc-1.14.5/compat_err.c.orig	2019-03-10 05:56:43.000000000 -0400
++++ mandoc-1.14.5/compat_err.c	2020-02-06 14:30:56.839081393 -0500
+@@ -1,10 +1,6 @@
+ #include "config.h"
+ 
+-#if HAVE_ERR
+-
+-int dummy;
+-
+-#else
++#if HAVE_ERR == 0
+ 
+ /* $Id: compat_err.c,v 1.4 2015/11/26 07:42:11 schwarze Exp $ */
+ /*
+diff -up mandoc-1.14.5/compat_fts.c.orig mandoc-1.14.5/compat_fts.c
+--- mandoc-1.14.5/compat_fts.c.orig	2019-03-10 05:56:43.000000000 -0400
++++ mandoc-1.14.5/compat_fts.c	2020-02-06 14:31:04.095057713 -0500
+@@ -1,10 +1,6 @@
+ #include "config.h"
+ 
+-#if HAVE_FTS
+-
+-int dummy;
+-
+-#else
++#if HAVE_FTS == 0
+ 
+ /*	$Id: compat_fts.c,v 1.14 2017/02/18 12:24:24 schwarze Exp $	*/
+ /*	$OpenBSD: fts.c,v 1.56 2016/09/21 04:38:56 guenther Exp $	*/
+diff -up mandoc-1.14.5/compat_getline.c.orig mandoc-1.14.5/compat_getline.c
+--- mandoc-1.14.5/compat_getline.c.orig	2019-03-10 05:56:43.000000000 -0400
++++ mandoc-1.14.5/compat_getline.c	2020-02-06 14:31:14.287024456 -0500
+@@ -1,10 +1,6 @@
+ #include "config.h"
+ 
+-#if HAVE_GETLINE
+-
+-int dummy;
+-
+-#else
++#if HAVE_GETLINE == 0
+ 
+ /*	$Id: compat_getline.c,v 1.1 2015/11/07 20:52:52 schwarze Exp $ */
+ /*
+diff -up mandoc-1.14.5/compat_getsubopt.c.orig mandoc-1.14.5/compat_getsubopt.c
+--- mandoc-1.14.5/compat_getsubopt.c.orig	2019-03-10 05:56:43.000000000 -0400
++++ mandoc-1.14.5/compat_getsubopt.c	2020-02-06 14:31:24.446991303 -0500
+@@ -1,10 +1,6 @@
+ #include "config.h"
+ 
+-#if HAVE_GETSUBOPT
+-
+-int dummy;
+-
+-#else
++#if HAVE_GETSUBOPT == 0
+ 
+ /*	$Id: compat_getsubopt.c,v 1.5 2014/08/17 20:53:50 schwarze Exp $	*/
+ /*	$OpenBSD: getsubopt.c,v 1.4 2005/08/08 08:05:36 espie Exp $	*/
+diff -up mandoc-1.14.5/compat_isblank.c.orig mandoc-1.14.5/compat_isblank.c
+--- mandoc-1.14.5/compat_isblank.c.orig	2019-03-10 05:56:43.000000000 -0400
++++ mandoc-1.14.5/compat_isblank.c	2020-02-06 14:31:33.686961149 -0500
+@@ -1,10 +1,6 @@
+ #include "config.h"
+ 
+-#if HAVE_ISBLANK
+-
+-int dummy;
+-
+-#else
++#if HAVE_ISBLANK == 0
+ 
+ /*	$Id: compat_isblank.c,v 1.2 2015/10/06 18:32:19 schwarze Exp $	*/
+ /*
+diff -up mandoc-1.14.5/compat_mkdtemp.c.orig mandoc-1.14.5/compat_mkdtemp.c
+--- mandoc-1.14.5/compat_mkdtemp.c.orig	2019-03-10 05:56:43.000000000 -0400
++++ mandoc-1.14.5/compat_mkdtemp.c	2020-02-06 14:31:41.758934811 -0500
+@@ -1,10 +1,6 @@
+ #include "config.h"
+ 
+-#if HAVE_MKDTEMP
+-
+-int dummy;
+-
+-#else
++#if HAVE_MKDTEMP == 0
+ 
+ /*	$Id: compat_mkdtemp.c,v 1.2 2015/10/06 18:32:19 schwarze Exp $	*/
+ /*
+diff -up mandoc-1.14.5/compat_ohash.c.orig mandoc-1.14.5/compat_ohash.c
+--- mandoc-1.14.5/compat_ohash.c.orig	2019-03-10 05:56:43.000000000 -0400
++++ mandoc-1.14.5/compat_ohash.c	2020-02-06 14:31:49.943908103 -0500
+@@ -1,10 +1,6 @@
+ #include "config.h"
+ 
+-#if HAVE_OHASH
+-
+-int dummy;
+-
+-#else
++#if HAVE_OHASH == 0
+ 
+ /* $OpenBSD: ohash.c,v 1.1 2014/06/02 18:52:03 deraadt Exp $ */
+ 
+diff -up mandoc-1.14.5/compat_progname.c.orig mandoc-1.14.5/compat_progname.c
+--- mandoc-1.14.5/compat_progname.c.orig	2019-03-10 05:56:43.000000000 -0400
++++ mandoc-1.14.5/compat_progname.c	2020-02-06 14:31:57.278884167 -0500
+@@ -1,10 +1,6 @@
+ #include "config.h"
+ 
+-#if HAVE_PROGNAME
+-
+-int dummy;
+-
+-#else
++#if HAVE_PROGNAME == 0
+ 
+ /*	$Id: compat_progname.c,v 1.1 2015/11/06 16:30:33 schwarze Exp $	*/
+ /*
+diff -up mandoc-1.14.5/compat_reallocarray.c.orig mandoc-1.14.5/compat_reallocarray.c
+--- mandoc-1.14.5/compat_reallocarray.c.orig	2019-03-10 05:56:43.000000000 -0400
++++ mandoc-1.14.5/compat_reallocarray.c	2020-02-06 14:32:05.686856733 -0500
+@@ -1,10 +1,6 @@
+ #include "config.h"
+ 
+-#if HAVE_REALLOCARRAY
+-
+-int dummy;
+-
+-#else
++#if HAVE_REALLOCARRAY == 0
+ 
+ /*	$Id: compat_reallocarray.c,v 1.4 2014/12/11 09:05:01 schwarze Exp $	*/
+ /*	$OpenBSD: reallocarray.c,v 1.2 2014/12/08 03:45:00 bcook Exp $	*/
+diff -up mandoc-1.14.5/compat_recallocarray.c.orig mandoc-1.14.5/compat_recallocarray.c
+--- mandoc-1.14.5/compat_recallocarray.c.orig	2019-03-10 05:56:43.000000000 -0400
++++ mandoc-1.14.5/compat_recallocarray.c	2020-02-06 14:32:14.070829371 -0500
+@@ -1,10 +1,6 @@
+ #include "config.h"
+ 
+-#if HAVE_RECALLOCARRAY
+-
+-int dummy;
+-
+-#else
++#if HAVE_RECALLOCARRAY == 0
+ 
+ /*	$Id: compat_recallocarray.c,v 1.1 2017/06/12 19:05:47 schwarze Exp $ */
+ /*	$OpenBSD: malloc.c,v 1.225 2017/05/13 07:11:29 otto Exp $ */
+diff -up mandoc-1.14.5/compat_strcasestr.c.orig mandoc-1.14.5/compat_strcasestr.c
+--- mandoc-1.14.5/compat_strcasestr.c.orig	2019-03-10 05:56:43.000000000 -0400
++++ mandoc-1.14.5/compat_strcasestr.c	2020-02-06 14:32:21.591804829 -0500
+@@ -1,10 +1,6 @@
+ #include "config.h"
+ 
+-#if HAVE_STRCASESTR
+-
+-int dummy;
+-
+-#else
++#if HAVE_STRCASESTR == 0
+ 
+ /*	$Id: compat_strcasestr.c,v 1.4 2014/12/11 09:19:32 schwarze Exp $	*/
+ /*	$NetBSD: strcasestr.c,v 1.3 2005/11/29 03:12:00 christos Exp $	*/
+diff -up mandoc-1.14.5/compat_stringlist.c.orig mandoc-1.14.5/compat_stringlist.c
+--- mandoc-1.14.5/compat_stringlist.c.orig	2019-03-10 05:56:43.000000000 -0400
++++ mandoc-1.14.5/compat_stringlist.c	2020-02-06 14:29:49.568300904 -0500
+@@ -1,10 +1,6 @@
+ #include "config.h"
+ 
+-#if HAVE_STRINGLIST
+-
+-int dummy;
+-
+-#else
++#if HAVE_STRINGLIST == 0
+ 
+ /*	$Id: compat_stringlist.c,v 1.6 2015/11/07 14:22:29 schwarze Exp $	*/
+ /*
+diff -up mandoc-1.14.5/compat_stringlist.h.orig mandoc-1.14.5/compat_stringlist.h
+diff -up mandoc-1.14.5/compat_strlcat.c.orig mandoc-1.14.5/compat_strlcat.c
+--- mandoc-1.14.5/compat_strlcat.c.orig	2019-03-10 05:56:43.000000000 -0400
++++ mandoc-1.14.5/compat_strlcat.c	2020-02-06 14:32:36.471756272 -0500
+@@ -1,10 +1,6 @@
+ #include "config.h"
+ 
+-#if HAVE_STRLCAT
+-
+-int dummy;
+-
+-#else
++#if HAVE_STRLCAT == 0
+ 
+ /*	$OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $	*/
+ 
+diff -up mandoc-1.14.5/compat_strlcpy.c.orig mandoc-1.14.5/compat_strlcpy.c
+--- mandoc-1.14.5/compat_strlcpy.c.orig	2019-03-10 05:56:43.000000000 -0400
++++ mandoc-1.14.5/compat_strlcpy.c	2020-02-06 14:32:44.447730243 -0500
+@@ -1,10 +1,6 @@
+ #include "config.h"
+ 
+-#if HAVE_STRLCPY
+-
+-int dummy;
+-
+-#else
++#if HAVE_STRLCPY == 0
+ 
+ /*	$OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $	*/
+ 
+diff -up mandoc-1.14.5/compat_strndup.c.orig mandoc-1.14.5/compat_strndup.c
+--- mandoc-1.14.5/compat_strndup.c.orig	2019-03-10 05:56:43.000000000 -0400
++++ mandoc-1.14.5/compat_strndup.c	2020-02-06 14:32:52.264704732 -0500
+@@ -1,10 +1,6 @@
+ #include "config.h"
+ 
+-#if HAVE_STRNDUP
+-
+-int dummy;
+-
+-#else
++#if HAVE_STRNDUP == 0
+ 
+ /* $Id: compat_strndup.c,v 1.1 2018/02/27 11:16:23 schwarze Exp $ */
+ /* OpenBSD: strndup.c,v 1.2 2015/08/31 02:53:57 guenther Exp */
+diff -up mandoc-1.14.5/compat_strsep.c.orig mandoc-1.14.5/compat_strsep.c
+--- mandoc-1.14.5/compat_strsep.c.orig	2019-03-10 05:56:43.000000000 -0400
++++ mandoc-1.14.5/compat_strsep.c	2020-02-06 14:33:01.807673592 -0500
+@@ -1,10 +1,6 @@
+ #include "config.h"
+ 
+-#if HAVE_STRSEP
+-
+-int dummy;
+-
+-#else
++#if HAVE_STRSEP == 0
+ 
+ /*	$Id: compat_strsep.c,v 1.4 2014/12/11 09:05:01 schwarze Exp $	*/
+ /*	$OpenBSD: strsep.c,v 1.7 2014/02/05 20:42:32 stsp Exp $	*/
+diff -up mandoc-1.14.5/compat_strtonum.c.orig mandoc-1.14.5/compat_strtonum.c
+--- mandoc-1.14.5/compat_strtonum.c.orig	2019-03-10 05:56:43.000000000 -0400
++++ mandoc-1.14.5/compat_strtonum.c	2020-02-06 14:33:10.839644116 -0500
+@@ -1,10 +1,6 @@
+ #include "config.h"
+ 
+-#if HAVE_STRTONUM
+-
+-int dummy;
+-
+-#else
++#if HAVE_STRTONUM == 0
+ 
+ /*	$Id: compat_strtonum.c,v 1.1 2015/02/16 14:56:22 schwarze Exp $	*/
+ /*	$OpenBSD: strtonum.c,v 1.7 2013/04/17 18:40:58 tedu Exp $	*/
+diff -up mandoc-1.14.5/compat_vasprintf.c.orig mandoc-1.14.5/compat_vasprintf.c
+--- mandoc-1.14.5/compat_vasprintf.c.orig	2019-03-10 05:56:43.000000000 -0400
++++ mandoc-1.14.5/compat_vasprintf.c	2020-02-06 14:33:18.119620363 -0500
+@@ -1,10 +1,6 @@
+ #include "config.h"
+ 
+-#if HAVE_VASPRINTF
+-
+-int dummy;
+-
+-#else
++#if HAVE_VASPRINTF == 0
+ 
+ /*	$Id: compat_vasprintf.c,v 1.3 2015/10/06 18:32:19 schwarze Exp $	*/
+ /*
+diff -up mandoc-1.14.5/tbl_html.c.orig mandoc-1.14.5/tbl_html.c