diff --git a/textproc/mdocml/Makefile b/textproc/mdocml/Makefile
index f8df0ab89667..79d26814bc1f 100644
--- a/textproc/mdocml/Makefile
+++ b/textproc/mdocml/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2014/01/06 17:43:50 tez Exp $
+# $NetBSD: Makefile,v 1.43 2014/08/10 20:51:01 wiz Exp $
 
-DISTNAME=	mdocml-1.12.3
-PKGREVISION=	1
+DISTNAME=	mdocml-1.13.1
 CATEGORIES=	textproc devel
 MASTER_SITES=	http://mdocml.bsd.lv/snapshots/
 
@@ -10,7 +9,7 @@ HOMEPAGE=	http://mdocml.bsd.lv/
 COMMENT=	Convert man pages from mdoc, man, and tbl to txt, html, ps, or pdf
 LICENSE=	2-clause-bsd # not exactly, but near enough
 
-MAKE_FLAGS+=	PREFIX=${PREFIX} DBLIB=${BDB_LIBS:Q}
+MAKE_FLAGS+=	PREFIX=${PREFIX}
 
 CONFLICTS=	man-pages-[0-9]*
 
@@ -30,5 +29,10 @@ MAKE_FLAGS+=	STATIC=
 post-extract:
 	${CP} -p ${FILESDIR}/*.c ${WRKSRC}
 
-.include "../../mk/bdb.buildlink3.mk"
+post-install:
+	cd ${DESTDIR}${PREFIX}/bin && mv preconv mandoc-preconv
+	cd ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 && mv preconv.1 mandoc-preconv.1
+	cd ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7 && mv roff.7 mandoc-roff.7
+
+.include "../../databases/sqlite3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/mdocml/PLIST b/textproc/mdocml/PLIST
index f4b87c1c9070..a53007c9ba3b 100644
--- a/textproc/mdocml/PLIST
+++ b/textproc/mdocml/PLIST
@@ -1,15 +1,19 @@
-@comment $NetBSD: PLIST,v 1.10 2014/03/19 21:48:54 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2014/08/10 20:51:01 wiz Exp $
 bin/demandoc
 bin/mandoc
 bin/mandoc-preconv
 include/mandoc/man.h
 include/mandoc/mandoc.h
+include/mandoc/mandoc_aux.h
 include/mandoc/mdoc.h
 lib/mandoc/libmandoc.a
 man/man1/demandoc.1
 man/man1/mandoc-preconv.1
 man/man1/mandoc.1
 man/man3/mandoc.3
+man/man3/mandoc_escape.3
+man/man3/mandoc_malloc.3
+man/man3/mchars_alloc.3
 man/man3/tbl.3
 man/man7/eqn.7
 man/man7/man.7
diff --git a/textproc/mdocml/distinfo b/textproc/mdocml/distinfo
index 314ef63bc771..3c8c0b7b52ed 100644
--- a/textproc/mdocml/distinfo
+++ b/textproc/mdocml/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.33 2014/01/06 17:43:50 tez Exp $
+$NetBSD: distinfo,v 1.34 2014/08/10 20:51:01 wiz Exp $
 
-SHA1 (mdocml-1.12.3.tar.gz) = 6a74b4e4b54a20b8022f05236e2294ad2915e5d7
-RMD160 (mdocml-1.12.3.tar.gz) = 0a9a717ddf9d32c4ce1be8e51659932c5ccf2b8b
-Size (mdocml-1.12.3.tar.gz) = 292544 bytes
-SHA1 (patch-Makefile) = 569fdf24dff306c6c7222a3807e99d9ae1bb0ce6
-SHA1 (patch-apropos__db.c) = efde1e020c84307e8549cf8b3e25668023fb4d34
-SHA1 (patch-mdoc_validate.c) = 270d754613fa4f1e079cc047593d1eb05c9fc7a9
+SHA1 (mdocml-1.13.1.tar.gz) = 50b12980e74eb705354775bd42a1a5d1910b8399
+RMD160 (mdocml-1.13.1.tar.gz) = f517562dac1d8cdfd3df6b2dbb2e02b175fa25e2
+Size (mdocml-1.13.1.tar.gz) = 317389 bytes
+SHA1 (patch-Makefile) = f4a62a80c7d18c71ecd18e3c0c39a7071de408c7
 SHA1 (patch-preconv.1) = 92787c58f451e1d247a25bbe136f188bf42e4c73
-SHA1 (patch-roff.7) = 9b6033b5ec92c8e8c827fe79aff30228f7c2fc2f
+SHA1 (patch-roff.7) = a975015fc4b0801f8c09c22ff4e27efdf585661a
diff --git a/textproc/mdocml/patches/patch-Makefile b/textproc/mdocml/patches/patch-Makefile
index 2425f5049a19..cc188cd5e0e6 100644
--- a/textproc/mdocml/patches/patch-Makefile
+++ b/textproc/mdocml/patches/patch-Makefile
@@ -1,25 +1,16 @@
-$NetBSD: patch-Makefile,v 1.6 2013/10/11 14:45:18 wiz Exp $
+$NetBSD: patch-Makefile,v 1.7 2014/08/10 20:51:01 wiz Exp $
 
-Install preconv and roff with 'mandoc-' prefix to avoid conflict with groff.
+Disable apropos, makewhatis, and man.cgi until mdocml includes a
+portable fts implementation.
 
---- Makefile.orig	2013-10-05 14:09:07.000000000 +0000
+--- Makefile.orig	2014-08-10 17:26:46.000000000 +0000
 +++ Makefile
-@@ -322,12 +322,15 @@ install: all
- 	mkdir -p $(DESTDIR)$(MANDIR)/man1
- 	mkdir -p $(DESTDIR)$(MANDIR)/man3
- 	mkdir -p $(DESTDIR)$(MANDIR)/man7
--	$(INSTALL_PROGRAM) mandoc preconv demandoc $(DESTDIR)$(BINDIR)
-+	$(INSTALL_PROGRAM) mandoc demandoc $(DESTDIR)$(BINDIR)
-+	$(INSTALL_PROGRAM) preconv $(DESTDIR)$(BINDIR)/mandoc-preconv
- 	$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
- 	$(INSTALL_LIB) man.h mdoc.h mandoc.h $(DESTDIR)$(INCLUDEDIR)
--	$(INSTALL_MAN) mandoc.1 preconv.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
-+	$(INSTALL_MAN) mandoc.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
-+	$(INSTALL_MAN) preconv.1 $(DESTDIR)$(MANDIR)/man1/mandoc-preconv.1
- 	$(INSTALL_MAN) mandoc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
--	$(INSTALL_MAN) man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
-+	$(INSTALL_MAN) man.7 mdoc.7 eqn.7 tbl.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
-+	$(INSTALL_MAN) roff.7 $(DESTDIR)$(MANDIR)/man7/mandoc-roff.7
- 	$(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR)
+@@ -57,7 +57,7 @@ INSTALL_MAN	 = $(INSTALL_DATA)
+ # Be careful: the fts(3) implementation in glibc is broken on 32bit
+ # machines, see: https://sourceware.org/bugzilla/show_bug.cgi?id=15838
+ #
+-BUILD_TARGETS	+= db-build
++#BUILD_TARGETS	+= db-build
  
- installcgi: all
+ # The remaining settings in this section
+ # are only relevant if db-build is enabled.
diff --git a/textproc/mdocml/patches/patch-apropos__db.c b/textproc/mdocml/patches/patch-apropos__db.c
deleted file mode 100644
index 51ae2a805ee9..000000000000
--- a/textproc/mdocml/patches/patch-apropos__db.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-apropos__db.c,v 1.4 2013/12/31 11:06:30 wiz Exp $
-
-SunOS fix.
-
---- apropos_db.c.orig	2013-10-05 15:09:07.000000000 +0100
-+++ apropos_db.c	2013-12-29 19:07:21.000000000 +0000
-@@ -141,6 +146,14 @@
- 			const struct expr *, size_t terms,
- 			struct mchars *, int);
- 
-+#ifdef __sun
-+#define strsep pkgsrc_strsep
-+#define strcasestr pkgsrc_strcasestr
-+
-+#include "strsep.c"
-+#include "strcasestr.c"
-+#endif
-+
- /*
-  * Open the keyword mandoc-db database.
-  */
diff --git a/textproc/mdocml/patches/patch-mdoc_validate.c b/textproc/mdocml/patches/patch-mdoc_validate.c
deleted file mode 100644
index bd79d422568f..000000000000
--- a/textproc/mdocml/patches/patch-mdoc_validate.c
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-mdoc_validate.c,v 1.1 2014/01/06 17:43:50 tez Exp $
-
-Solaris, Mingw32 & OS X prior to 10.7 are missing strnlen
-
-
---- mdoc_validate.c.orig	Mon Jan  6 10:25:04 2014
-+++ mdoc_validate.c	Mon Jan  6 10:36:31 2014
-@@ -1863,6 +1863,15 @@
- 	return(1);
- }
- 
-+#if defined(__MINGW32__) ||defined(__sun) || defined(__APPLE__)
-+static size_t p_strnlen(const char *s, size_t maxlen) {
-+  const char *end = memchr(s, 0, maxlen);
-+  return end ? (size_t)(end - s) : maxlen;
-+}
-+#else
-+ # define p_strnlen strnlen
-+#endif
-+
- /*
-  * For some arguments of some macros,
-  * convert all breakable hyphens into ASCII_HYPH.
-@@ -1893,7 +1902,7 @@
- 		if (MDOC_TEXT != nch->type)
- 			continue;
- 		cp = nch->string;
--		if (3 > strnlen(cp, 3))
-+		if (3 > p_strnlen(cp, 3))
- 			continue;
- 		while ('\0' != *(++cp))
- 			if ('-' == *cp &&
diff --git a/textproc/mdocml/patches/patch-roff.7 b/textproc/mdocml/patches/patch-roff.7
index 5d1327b3ca25..7b81de0c1ebc 100644
--- a/textproc/mdocml/patches/patch-roff.7
+++ b/textproc/mdocml/patches/patch-roff.7
@@ -1,13 +1,13 @@
-$NetBSD: patch-roff.7,v 1.3 2013/12/31 11:06:30 wiz Exp $
+$NetBSD: patch-roff.7,v 1.4 2014/08/10 20:51:01 wiz Exp $
 
 Install preconv and roff with 'mandoc-' prefix to avoid conflict with groff.
 
---- roff.7.orig	2013-12-28 23:28:23.000000000 +0000
+--- roff.7.orig	2014-08-08 20:40:44.000000000 +0000
 +++ roff.7
 @@ -16,10 +16,10 @@
  .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  .\"
- .Dd $Mdocdate: December 26 2013 $
+ .Dd $Mdocdate: July 7 2014 $
 -.Dt ROFF 7
 +.Dt MANDOC-ROFF 7
  .Os