diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile
index 06078725007d..84f81c3bf26b 100644
--- a/ports-mgmt/pkg/Makefile
+++ b/ports-mgmt/pkg/Makefile
@@ -3,7 +3,7 @@ DISTVERSION=	2.1.0
 _PKG_VERSION=	${DISTVERSION}
 CATEGORIES=	ports-mgmt
 
-MAINTAINER=	pkg@FreeBSD.org
+MAINTAINER=	ports@ServBSD.org
 COMMENT=	Package manager
 WWW=		https://github.com/freebsd/pkg
 
@@ -11,25 +11,17 @@ LICENSE=	BSD2CLAUSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
-
 USE_LDCONFIG=	${PREFIX}/lib/compat/pkg
-HAS_CONFIGURE=	yes
-PORTDOCS=	NEWS
-PORTSCOUT=	ignore:1
-CONFIGURE_ARGS=	--prefix="${PREFIX}"
-CONFIGURE_ENV=	CC_FOR_BUILD="${CC}"
-
 # Use a submake as 'deinstall install' needs to reevaluate PKG_REGISTER
 # so that pkg-static is used from the wrkdir
 USE_SUBMAKE=	yes
+
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix="${PREFIX}"
+CONFIGURE_ENV=	CC_FOR_BUILD="${CC}"
+
 CFLAGS+=	-Wno-error
 
-OPTIONS_DEFINE=	DOCS
-
-.if !exists(/usr/include/jail.h)
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-docs_pkg.8
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_DEBUG)
@@ -49,8 +41,4 @@ PKG_BIN=	${WRKSRC}/src/pkg-static
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg
 
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}/NEWS
-
 .include <bsd.port.post.mk>
diff --git a/ports-mgmt/pkg/files/extra-patch-docs_pkg.8 b/ports-mgmt/pkg/files/extra-patch-docs_pkg.8
deleted file mode 100644
index afd5e9d489a1..000000000000
--- a/ports-mgmt/pkg/files/extra-patch-docs_pkg.8
+++ /dev/null
@@ -1,34 +0,0 @@
---- docs/pkg.8.orig	2015-04-14 18:00:21 UTC
-+++ docs/pkg.8
-@@ -29,7 +29,7 @@
- .Op Fl d
- .Op Fl l
- .Op Fl N
--.Op Fl j Ao jail name or id Ac | Fl c Ao chroot path Ac | Fl r Ao root directory Ac
-+.Op Fl j Ao chroot path Ac | Fl r Ao root directory Ac
- .Op Fl C Ao configuration file Ac
- .Op Fl R Ao repository configuration directory Ac
- .Op Fl 4 | Fl 6
-@@ -144,22 +144,6 @@ is installed and activated:
-     # pkg_install-specifics
-   fi
- .Ed
--.It Fl j Ao jail name or id Ac , Cm --jail Ao jail name or id Ac
--.Nm
--will execute in the given
--.Ao jail name or id Ac ,
--where
--.Em name
--matches
--.Dq Cm jls Ar name
--and
--.Em id
--matches
--.Dq Cm jls Ar jid .
--See
--.Xr jail 8
--and
--.Xr jls 8 .
- .It Fl c Ao chroot path Ac , Cm --chroot Ao chroot path Ac
- .Nm
- will chroot in the