diff --git a/extra/mandoc/build b/extra/mandoc/build
index cba739ac..119abb5b 100755
--- a/extra/mandoc/build
+++ b/extra/mandoc/build
@@ -1,7 +1,6 @@
 #!/bin/sh -e
 
 patch -p1 < mandoc-no-warn.patch
-patch -p1 < fix-tbl-segfault.patch
 
 # Change default pager.
 sed 's,"more -s","less",g' main.c > _
diff --git a/extra/mandoc/checksums b/extra/mandoc/checksums
index 4ce1bf85..7bb0d730 100644
--- a/extra/mandoc/checksums
+++ b/extra/mandoc/checksums
@@ -1,3 +1,2 @@
-8219b42cb56fc07b2aa660574e6211ac38eefdbf21f41b698d3348793ba5d8f7
-eaff34c03d1b6741cf6b24a394c63ad6096e4391578414b9da986294ee817a25
-12e6138be6ec2e8a34373876d8a5fce387a1d2b51a461ae20e1d98637af1d15c
+8bf0d570f01e70a6e124884088870cbed7537f36328d512909eb10cd53179d9c
+1fef8afb447199512ab8bc000c85c24ee77649af850cd71f5023d5d7787e0cd7
diff --git a/extra/mandoc/patches/fix-tbl-segfault.patch b/extra/mandoc/patches/fix-tbl-segfault.patch
deleted file mode 100644
index b3147c76..00000000
--- a/extra/mandoc/patches/fix-tbl-segfault.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- tbl_term.c	2020-08-18 12:35:27.290953791 +0200
-+++ tbl_term.c	2020-08-18 12:35:23.450952148 +0200
-@@ -626,7 +626,7 @@
- 
- 		lw = cpp == NULL || cpn == NULL ||
- 		    (cpn->pos != TBL_CELL_DOWN &&
--		     (dpn == NULL || strcmp(dpn->string, "\\^") != 0))
-+		     (dpn == NULL || dpn->pos == TBL_DATA_NONE || strcmp(dpn->string, "\\^") != 0))
- 		    ? hw : 0;
- 		tbl_direct_border(tp, BHORIZ * lw,
- 		    col->width + col->spacing / 2);
-@@ -670,7 +670,7 @@
- 
- 		rw = cpp == NULL || cpn == NULL ||
- 		    (cpn->pos != TBL_CELL_DOWN &&
--		     (dpn == NULL || strcmp(dpn->string, "\\^") != 0))
-+		     (dpn == NULL || dpn->pos == TBL_DATA_NONE || strcmp(dpn->string, "\\^") != 0))
- 		    ? hw : 0;
- 
- 		/* The line crossing at the end of this column. */
diff --git a/extra/mandoc/patches/mandoc-no-warn.patch b/extra/mandoc/patches/mandoc-no-warn.patch
index 1f49a123..7cc1d63f 100644
--- a/extra/mandoc/patches/mandoc-no-warn.patch
+++ b/extra/mandoc/patches/mandoc-no-warn.patch
@@ -1,13 +1,13 @@
 diff --git a/main.c b/main.c
-index b91c158..514508a 100644
+index c5a7cff..5a92c34 100644
 --- a/main.c
 +++ b/main.c
-@@ -750,8 +750,6 @@ fs_lookup(const struct manpaths *paths, size_t ipath,
- 	return globres != -1;
+@@ -822,8 +822,6 @@ fs_lookup(const struct manpaths *paths, size_t ipath,
+ 	return globres;
  
  found:
 -	warnx("outdated mandoc.db lacks %s(%s) entry, run %s %s",
 -	    name, sec, BINM_MAKEWHATIS, paths->paths[ipath]);
- 	if (res == NULL) {
+ 	if (res == NULL)
  		free(file);
- 		return 1;
+ 	else if (file == NULL)
diff --git a/extra/mandoc/sources b/extra/mandoc/sources
index d87834c2..5fa2a6ce 100644
--- a/extra/mandoc/sources
+++ b/extra/mandoc/sources
@@ -1,3 +1,2 @@
-https://fossies.org/linux/misc/mandoc-VERSION.tar.gz
+https://mandoc.bsd.lv/snapshots/mandoc-VERSION.tar.gz
 patches/mandoc-no-warn.patch
-patches/fix-tbl-segfault.patch
diff --git a/extra/mandoc/version b/extra/mandoc/version
index aa6575cc..5a7d1b1c 100644
--- a/extra/mandoc/version
+++ b/extra/mandoc/version
@@ -1 +1 @@
-1.14.5 4
+1.14.6 1