diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index 18dbe845fb7a..e78d6c715e21 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-doc-all
-PORTVERSION=	43251
+PORTVERSION=	43641
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	#empty
diff --git a/misc/freebsd-doc-el/pkg-plist.common b/misc/freebsd-doc-el/pkg-plist.common
index 2094da6e5c2f..1e306303b0aa 100644
--- a/misc/freebsd-doc-el/pkg-plist.common
+++ b/misc/freebsd-doc-el/pkg-plist.common
@@ -1,5 +1,4 @@
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization
-@dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/books/handbook/install
diff --git a/misc/freebsd-doc-el/pkg-plist.html-common b/misc/freebsd-doc-el/pkg-plist.html-common
index 0dfbd1ee8120..fa3552890ff7 100644
--- a/misc/freebsd-doc-el/pkg-plist.html-common
+++ b/misc/freebsd-doc-el/pkg-plist.html-common
@@ -30,6 +30,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/isdn-twisted-pair.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/natd.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/net-routing.png
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/pxe-nfs.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/advanced-networking/static-routes.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser1.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall/bsdinstall-adduser2.png
@@ -174,13 +175,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security/ipsec-encap-pkt.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security/ipsec-network.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security/ipsec-out-pkt.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum/vinum-concat.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum/vinum-mirrored-vol.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum/vinum-raid10-vol.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum/vinum-raid5-org.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum/vinum-simple-vol.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum/vinum-striped-vol.png
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum/vinum-striped.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization/parallels-freebsd1.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization/parallels-freebsd10.png
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization/parallels-freebsd11.png
diff --git a/misc/freebsd-doc-el/pkg-plist.html-split b/misc/freebsd-doc-el/pkg-plist.html-split
index 1ce71a1fb56d..fbb0c06eccf3 100644
--- a/misc/freebsd-doc-el/pkg-plist.html-split
+++ b/misc/freebsd-doc-el/pkg-plist.html-split
@@ -159,7 +159,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/backup-basics.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/backup-strategies.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/backups-floppybackups.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/backups-tapebackups.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics-daemons.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/basics-devices.html
@@ -229,6 +228,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disk-organization.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-adding.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-encrypting.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-hast.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-naming.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-virtual.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks.html
@@ -387,7 +387,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing-using.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/printing.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/quotas.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/raid.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/scanners.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/securing-freebsd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/security-accounting.html
@@ -427,18 +426,10 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-user.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/users.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-bsdinstall.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-live-cd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-localization.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-sysinstall.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/video-playback.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum-access-bottlenecks.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum-config.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum-data-integrity.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum-examples.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum-intro.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum-object-naming.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum-objects.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum-root.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/vinum-vinum.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-guest.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization-host.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/virtualization.html
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index 687f1c3884a8..e67093a12c7f 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	43251
+PORTVERSION=	43641
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend
@@ -11,14 +11,7 @@ PKGNAMEPREFIX?=	en-
 MAINTAINER=	doceng@FreeBSD.org
 COMMENT?=	Documentation from the FreeBSD Documentation Project
 
-BUILD_DEPENDS=	docproj>=2.0_1:${PORTSDIR}/textproc/docproj \
-		fop:${PORTSDIR}/textproc/fop \
-		${LOCALBASE}/lib/X11/fonts/GentiumPlus/GentiumPlus-R.ttf:${PORTSDIR}/x11-fonts/gentium-plus \
-		${LOCALBASE}/lib/X11/fonts/Droid/DroidSans.ttf:${PORTSDIR}/x11-fonts/droid-fonts-ttf \
-		${LOCALBASE}/lib/X11/fonts/Lohit/Lohit-Bengali.ttf:${PORTSDIR}/x11-fonts/lohit \
-		${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSansMono.ttf:${PORTSDIR}/x11-fonts/dejavu \
-		${LOCALBASE}/share/fonts/TrueType/gkai00mp.ttf:${PORTSDIR}/chinese/arphicttf \
-		${LOCALBASE}/share/fonts/OTF/ipam.otf:${PORTSDIR}/japanese/font-ipa
+BUILD_DEPENDS=	docproj>=2.0_1:${PORTSDIR}/textproc/docproj
 
 WRKSRC=		${WRKDIR}/doc
 PLIST_SUB=	DOCSDIR=${DOCBASE} \
@@ -62,6 +55,16 @@ PLIST_FORMATS+=	${O:L:S,_,-,}
 .endif
 .endfor
 
+.if ${PORT_OPTIONS:MPDF} || ${PORT_OPTIONS:MPS}
+BUILD_DEPENDS+=	fop:${PORTSDIR}/textproc/fop \
+		${LOCALBASE}/lib/X11/fonts/GentiumPlus/GentiumPlus-R.ttf:${PORTSDIR}/x11-fonts/gentium-plus \
+		${LOCALBASE}/lib/X11/fonts/Droid/DroidSans.ttf:${PORTSDIR}/x11-fonts/droid-fonts-ttf \
+		${LOCALBASE}/lib/X11/fonts/Lohit/Lohit-Bengali.ttf:${PORTSDIR}/x11-fonts/lohit \
+		${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSansMono.ttf:${PORTSDIR}/x11-fonts/dejavu \
+		${LOCALBASE}/share/fonts/TrueType/gkai00mp.ttf:${PORTSDIR}/chinese/arphicttf \
+		${LOCALBASE}/share/fonts/OTF/ipam.otf:${PORTSDIR}/japanese/font-ipa
+.endif
+
 # when html or html-split is defined as the format, add HTML_COMMON.
 .if ${PORT_OPTIONS:MHTML} || ${PORT_OPTIONS:MHTML_SPLIT}
 PLIST_FORMATS+=	html-common
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index c6a2e1af16b1..40edd34d4be2 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freebsd-doc-43251.tar.gz) = 93bd4c94f6c4a5d3e387b5198e85c047582c8884acb3eaee65d95e63f11fda5d
-SIZE (freebsd-doc-43251.tar.gz) = 32806011
+SHA256 (freebsd-doc-43641.tar.gz) = 520277fd5f3aea52a99b24d5000e8f7af51e0030a3f3eee3894621c1a0bdcb7e
+SIZE (freebsd-doc-43641.tar.gz) = 32716947
diff --git a/misc/freebsd-doc-en/pkg-plist.common b/misc/freebsd-doc-en/pkg-plist.common
index 0846bc226d5e..9c8b9946abdf 100644
--- a/misc/freebsd-doc-en/pkg-plist.common
+++ b/misc/freebsd-doc-en/pkg-plist.common
@@ -76,6 +76,8 @@
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/console-server
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/imagelib/callouts
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/imagelib
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/building-products
diff --git a/misc/freebsd-doc-en/pkg-plist.html-common b/misc/freebsd-doc-en/pkg-plist.html-common
index 5ed0ce17907e..8822cf0cb5ca 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-common
+++ b/misc/freebsd-doc-en/pkg-plist.html-common
@@ -4,6 +4,9 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/building-products/freebsd-organization.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/casestudy-argentina.com/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/imagelib/callouts/1.png
+%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/imagelib/callouts/2.png
+%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/imagelib/callouts/3.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/console-server/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/console-server/tk0231-9-1.png
diff --git a/misc/freebsd-doc-en/pkg-plist.html-split b/misc/freebsd-doc-en/pkg-plist.html-split
index cfae2ab875c5..756184a41de5 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-split
+++ b/misc/freebsd-doc-en/pkg-plist.html-split
@@ -38,6 +38,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/people.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/perks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/ports.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/pgpkeys.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/pref-license.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/rules.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/committers-guide/ssh.guide.html
diff --git a/misc/freebsd-doc-ja/pkg-plist.html-split b/misc/freebsd-doc-ja/pkg-plist.html-split
index 77cfb045c8c1..ff750f905ceb 100644
--- a/misc/freebsd-doc-ja/pkg-plist.html-split
+++ b/misc/freebsd-doc-ja/pkg-plist.html-split
@@ -154,6 +154,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/dialout.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/dialup.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/dirstructure.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/disk-organization.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-adding.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-encrypting.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks-naming.html
diff --git a/misc/freebsd-doc-ru/pkg-plist.html-split b/misc/freebsd-doc-ru/pkg-plist.html-split
index 5c25c96f2e4d..ce79d428c49a 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html-split
+++ b/misc/freebsd-doc-ru/pkg-plist.html-split
@@ -512,14 +512,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/updating-upgrading.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/usb-disks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/userppp.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-groups.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-introduction.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-limiting.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-modifying.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-superuser.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-system.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-user.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/users-synopsis.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-bsdinstall.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-live-cd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/using-localization.html