diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index 00b4945922538..ba8592cabdda8 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	portupgrade
 PORTVERSION=	20180309
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	3
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	GH \
diff --git a/ports-mgmt/portupgrade-devel/files/patch-man_Makefile b/ports-mgmt/portupgrade-devel/files/patch-man_Makefile
new file mode 100644
index 0000000000000..ad3ee29dc4477
--- /dev/null
+++ b/ports-mgmt/portupgrade-devel/files/patch-man_Makefile
@@ -0,0 +1,9 @@
+--- man/Makefile.orig	2018-03-09 18:59:29 UTC
++++ man/Makefile
+@@ -1,5 +1,5 @@
+ 
+-MANDIR=		${PREFIX}/man/man
++MANDIR=		${PREFIX}/share/man/man
+ 
+ MAN1=		pkg_deinstall.1 \
+ 		pkg_fetch.1 \
diff --git a/ports-mgmt/portupgrade-devel/pkg-plist b/ports-mgmt/portupgrade-devel/pkg-plist
index 4872d0094776a..4f76e3c14c882 100644
--- a/ports-mgmt/portupgrade-devel/pkg-plist
+++ b/ports-mgmt/portupgrade-devel/pkg-plist
@@ -1,20 +1,20 @@
 @dir lib/compat/pkg
-man/man1/pkg_deinstall.1.gz
-man/man1/pkg_fetch.1.gz
-man/man1/pkg_glob.1.gz
-man/man1/pkg_sort.1.gz
-man/man1/pkg_which.1.gz
-man/man1/pkgdb.1.gz
-man/man1/pkgdu.1.gz
-man/man1/portcvsweb.1.gz
-man/man1/portinstall.1.gz
-man/man1/ports_glob.1.gz
-man/man1/portsclean.1.gz
-man/man1/portsdb.1.gz
-man/man1/portsvnweb.1.gz
-man/man1/portupgrade.1.gz
-man/man1/portversion.1.gz
-man/man5/pkgtools.conf.5.gz
+share/man/man1/pkg_deinstall.1.gz
+share/man/man1/pkg_fetch.1.gz
+share/man/man1/pkg_glob.1.gz
+share/man/man1/pkg_sort.1.gz
+share/man/man1/pkg_which.1.gz
+share/man/man1/pkgdb.1.gz
+share/man/man1/pkgdu.1.gz
+share/man/man1/portcvsweb.1.gz
+share/man/man1/portinstall.1.gz
+share/man/man1/ports_glob.1.gz
+share/man/man1/portsclean.1.gz
+share/man/man1/portsdb.1.gz
+share/man/man1/portsvnweb.1.gz
+share/man/man1/portupgrade.1.gz
+share/man/man1/portversion.1.gz
+share/man/man5/pkgtools.conf.5.gz
 sbin/pkg_deinstall
 sbin/pkg_fetch
 sbin/pkg_glob
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index 3ea3d7e0f20c2..858c5a271420f 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	portupgrade
 PORTVERSION=	2.4.16
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
diff --git a/ports-mgmt/portupgrade/files/patch-man_Makefile b/ports-mgmt/portupgrade/files/patch-man_Makefile
new file mode 100644
index 0000000000000..ad3ee29dc4477
--- /dev/null
+++ b/ports-mgmt/portupgrade/files/patch-man_Makefile
@@ -0,0 +1,9 @@
+--- man/Makefile.orig	2018-03-09 18:59:29 UTC
++++ man/Makefile
+@@ -1,5 +1,5 @@
+ 
+-MANDIR=		${PREFIX}/man/man
++MANDIR=		${PREFIX}/share/man/man
+ 
+ MAN1=		pkg_deinstall.1 \
+ 		pkg_fetch.1 \
diff --git a/ports-mgmt/portupgrade/pkg-plist b/ports-mgmt/portupgrade/pkg-plist
index 129679dc0e023..82b9bd45cf1f8 100644
--- a/ports-mgmt/portupgrade/pkg-plist
+++ b/ports-mgmt/portupgrade/pkg-plist
@@ -1,20 +1,20 @@
 @dir lib/compat/pkg
-man/man1/pkg_deinstall.1.gz
-man/man1/pkg_fetch.1.gz
-man/man1/pkg_glob.1.gz
-man/man1/pkg_sort.1.gz
-man/man1/pkg_which.1.gz
-man/man1/pkgdb.1.gz
-man/man1/pkgdu.1.gz
-man/man1/portcvsweb.1.gz
-man/man1/portinstall.1.gz
-man/man1/ports_glob.1.gz
-man/man1/portsclean.1.gz
-man/man1/portsdb.1.gz
-man/man1/portsvnweb.1.gz
-man/man1/portupgrade.1.gz
-man/man1/portversion.1.gz
-man/man5/pkgtools.conf.5.gz
+share/man/man1/pkg_deinstall.1.gz
+share/man/man1/pkg_fetch.1.gz
+share/man/man1/pkg_glob.1.gz
+share/man/man1/pkg_sort.1.gz
+share/man/man1/pkg_which.1.gz
+share/man/man1/pkgdb.1.gz
+share/man/man1/pkgdu.1.gz
+share/man/man1/portcvsweb.1.gz
+share/man/man1/portinstall.1.gz
+share/man/man1/ports_glob.1.gz
+share/man/man1/portsclean.1.gz
+share/man/man1/portsdb.1.gz
+share/man/man1/portsvnweb.1.gz
+share/man/man1/portupgrade.1.gz
+share/man/man1/portversion.1.gz
+share/man/man5/pkgtools.conf.5.gz
 sbin/pkg_deinstall
 sbin/pkg_fetch
 sbin/pkg_glob