diff --git a/editors/mp/Makefile b/editors/mp/Makefile
index 1620f95b87c3..e8c932ad254c 100644
--- a/editors/mp/Makefile
+++ b/editors/mp/Makefile
@@ -1,122 +1,123 @@
 PORTNAME=	mp
 DISTVERSION=	5.61
+PORTREVISION=	1
 CATEGORIES=	editors
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Programming text editor
 WWW=		https://www.triptico.com/software/mp.html
 
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		gmake iconv
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ttcdt
 GH_PROJECT=	mp-5.x
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	config.sh
 CONFIGURE_ARGS=	--prefix=${PREFIX} --docdir=${DOCSDIR} \
 		--without-win32 --without-kde4 --without-qt4
 CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}" \
 		ICONV_LIB="${ICONV_LIB}" \
 		ICONV_PREFIX="${ICONV_PREFIX}" \
 		NCURSESINC="${NCURSESINC}" \
 		NCURSESLIB="${NCURSESLIB}"
 LDFLAGS+=	-Wl,--as-needed
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=		DOCS MANPAGES NLS PCRE
 OPTIONS_RADIO=		GUI
 OPTIONS_RADIO_GUI=	GTK2 GTK3 QT5
 CONSOLE_DESC=		${NCURSES_DESC}
 OPTIONS_SINGLE=		CONSOLE
 OPTIONS_SINGLE_CONSOLE=	ANSI NCURSES
 OPTIONS_DEFAULT=	MANPAGES NCURSES PCRE
 OPTIONS_SUB=		yes
 
 DOCS_BUILD_DEPENDS=	p5-Grutatxt>=0:textproc/p5-Grutatxt \
 			mp_doccer:textproc/mp_doccer
 DOCS_CONFIGURE_WITH=	docs
 
 MANPAGES_BUILD_DEPENDS=	p5-Grutatxt>=0:textproc/p5-Grutatxt
 MANPAGES_CONFIGURE_WITH=manpages
 
 NLS_USES=		gettext
 NLS_CONFIGURE_WITH=	gettext
 
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_CONFIGURE_WITH=	pcre
 
 ANSI_DESC=		ANSI terminal support
 ANSI_CONFIGURE_WITH=	ansi
 
 GTK2_USES=		gnome pkgconfig
 GTK2_USE=		gnome=cairo,gdkpixbuf2,gtk20
 GTK2_CONFIGURE_ON=	--with-gtk=2
 
 GTK3_USES=		gnome pkgconfig
 GTK3_USE=		gnome=cairo,gdkpixbuf2,gtk30
 GTK3_CONFIGURE_ON=	--with-gtk=3
 
 NCURSES_USES=		ncurses
 NCURSES_CONFIGURE_WITH=	curses
 NCURSES_CFLAGS=		-I${NCURSESBASE}/include
 
 QT5_USES=		compiler:c++11-lang gl pkgconfig qmake:no_env qt:5
 QT5_USE=		cxxstd=-std=c++11 \
 			gl=gl \
 			qt=buildtools:build,core,gui,widgets
 QT5_CONFIGURE_ENV=	CCLINK="${CXX}"
 QT5_CONFIGURE_ON=	--with-qt5 --with-moc="${MOC}"
 QT5_CONFIGURE_OFF=	--without-qt
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGTK*} || ${PORT_OPTIONS:MQT5}
 USES+=		desktop-file-utils
 PLIST_SUB+=	GUI=""
 .else
 PLIST_SUB+=	GUI="@comment "
 .endif
 
 .if !${PORT_OPTIONS:MGTK*}
 CONFIGURE_ARGS+=	--without-gtk
 .endif
 
 do-configure:
 	@(for CONFIGURE_WRKSRC in ${WRKSRC}/mpdm ${WRKSRC}/mpsl ${WRKSRC}; \
 	  do \
 	    cd $${CONFIGURE_WRKSRC} && \
 	      ${SETENV} CC="${CC}" CPP="${CXX}" \
 	      CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 	      LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \
 	      ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}; \
 	  done;)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mp-5 ${STAGEDIR}${PREFIX}/bin
 .if ${PORT_OPTIONS:MGTK*} || ${PORT_OPTIONS:MQT5}
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/minimum-profit.desktop ${STAGEDIR}${PREFIX}/share/applications
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps
 	${INSTALL_DATA} ${WRKSRC}/minimum-profit.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps
 .endif
 
 do-install-NLS-on:
 .for lang in de es it nl ru sv
 	${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo \
 		${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES/minimum-profit.mo
 .endfor
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in README RELEASE_NOTES mp_templates.sample doc/* mpdm/doc/* mpsl/doc/*
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 do-install-MANPAGES-on:
-	${INSTALL_MAN} ${WRKSRC}/mp-5.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/mp-5.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/editors/mp/pkg-plist b/editors/mp/pkg-plist
index aceb3b5fbc47..54a6800d792f 100644
--- a/editors/mp/pkg-plist
+++ b/editors/mp/pkg-plist
@@ -1,52 +1,52 @@
 bin/mp-5
-%%MANPAGES%%man/man1/mp-5.1.gz
+%%MANPAGES%%share/man/man1/mp-5.1.gz
 %%GUI%%share/applications/minimum-profit.desktop
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 %%PORTDOCS%%%%DOCSDIR%%/mp_actions.gmi
 %%PORTDOCS%%%%DOCSDIR%%/mp_actions.txt
 %%PORTDOCS%%%%DOCSDIR%%/mp_api.html
 %%PORTDOCS%%%%DOCSDIR%%/mp_api.txt
 %%PORTDOCS%%%%DOCSDIR%%/mp_configuration.gmi
 %%PORTDOCS%%%%DOCSDIR%%/mp_configuration.txt
 %%PORTDOCS%%%%DOCSDIR%%/mp_cookbook.html
 %%PORTDOCS%%%%DOCSDIR%%/mp_cookbook.txt
 %%PORTDOCS%%%%DOCSDIR%%/mp_data_model.html
 %%PORTDOCS%%%%DOCSDIR%%/mp_data_model.txt
 %%PORTDOCS%%%%DOCSDIR%%/mp_encoding.html
 %%PORTDOCS%%%%DOCSDIR%%/mp_encoding.txt
 %%PORTDOCS%%%%DOCSDIR%%/mp_index.html
 %%PORTDOCS%%%%DOCSDIR%%/mp_index.txt
 %%PORTDOCS%%%%DOCSDIR%%/mp_interactive_dialog_boxes.html
 %%PORTDOCS%%%%DOCSDIR%%/mp_interactive_dialog_boxes.txt
 %%PORTDOCS%%%%DOCSDIR%%/mp_internals.html
 %%PORTDOCS%%%%DOCSDIR%%/mp_internals.txt
 %%PORTDOCS%%%%DOCSDIR%%/mp_keycodes.html
 %%PORTDOCS%%%%DOCSDIR%%/mp_keycodes.txt
 %%PORTDOCS%%%%DOCSDIR%%/mp_man.html
 %%PORTDOCS%%%%DOCSDIR%%/mp_man.txt
 %%PORTDOCS%%%%DOCSDIR%%/mp_templates.sample
 %%PORTDOCS%%%%DOCSDIR%%/mpdm_api.html
 %%PORTDOCS%%%%DOCSDIR%%/mpdm_api.txt
 %%PORTDOCS%%%%DOCSDIR%%/mpdm_overview.html
 %%PORTDOCS%%%%DOCSDIR%%/mpdm_overview.txt
 %%PORTDOCS%%%%DOCSDIR%%/mpsl_api.html
 %%PORTDOCS%%%%DOCSDIR%%/mpsl_api.txt
 %%PORTDOCS%%%%DOCSDIR%%/mpsl_index.html
 %%PORTDOCS%%%%DOCSDIR%%/mpsl_index.txt
 %%PORTDOCS%%%%DOCSDIR%%/mpsl_internals.html
 %%PORTDOCS%%%%DOCSDIR%%/mpsl_internals.txt
 %%PORTDOCS%%%%DOCSDIR%%/mpsl_overview.html
 %%PORTDOCS%%%%DOCSDIR%%/mpsl_overview.txt
 %%PORTDOCS%%%%DOCSDIR%%/mpsl_quickref.ps
 %%PORTDOCS%%%%DOCSDIR%%/mpsl_quickref.txt
 %%PORTDOCS%%%%DOCSDIR%%/mpsl_reference.html
 %%PORTDOCS%%%%DOCSDIR%%/mpsl_reference.txt
 %%PORTDOCS%%%%DOCSDIR%%/mptxt_format.txt
 %%GUI%%share/icons/hicolor/48x48/apps/minimum-profit.png
 %%NLS%%share/locale/de/LC_MESSAGES/minimum-profit.mo
 %%NLS%%share/locale/es/LC_MESSAGES/minimum-profit.mo
 %%NLS%%share/locale/it/LC_MESSAGES/minimum-profit.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/minimum-profit.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/minimum-profit.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/minimum-profit.mo