diff --git a/sysutils/magicrescue/Makefile b/sysutils/magicrescue/Makefile
index 43513981e07b..0a7894afc1be 100644
--- a/sysutils/magicrescue/Makefile
+++ b/sysutils/magicrescue/Makefile
@@ -1,33 +1,36 @@
 PORTNAME=	magicrescue
-PORTVERSION=	1.1.10
 DISTVERSIONPREFIX=	v
+DISTVERSION=	1.1.10
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	File recovery tool which recovers deleted files from a block device
 WWW=		https://github.com/jbj/magicrescue/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		perl5 shebangfix
-USE_PERL5=	run
-
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX}
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	jbj
+USE_PERL5=	run
 
 SHEBANG_FILES=	magicsort tools/*.pl tools/checkrecipe
 
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX}
+
 MAKE_ENV+=	STAGEDIR=${STAGEDIR}
 
+# remove after manprefix migration
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/magicrescue \
 		${STAGEDIR}${PREFIX}/bin/dupemap
 .for f in safecat inputseek textextract
 	${STRIP_CMD} ${STAGEDIR}${DATADIR}/tools/${f}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/sysutils/magicrescue/files/patch-Makefile.in b/sysutils/magicrescue/files/patch-Makefile.in
new file mode 100644
index 000000000000..80c92e55a3ba
--- /dev/null
+++ b/sysutils/magicrescue/files/patch-Makefile.in
@@ -0,0 +1,26 @@
+--- Makefile.in.orig	2018-11-24 19:21:20 UTC
++++ Makefile.in
+@@ -58,12 +58,12 @@ install: all
+ install: all
+ 	mkdir -p $(INSTALLDIR)/share/magicrescue/tools \
+ 	    $(INSTALLDIR)/share/magicrescue/recipes \
+-	    $(INSTALLDIR)/man/man1 \
++	    $(INSTALLDIR)/share/man/man1 \
+ 	    $(INSTALLDIR)/bin
+ 	
+ 	cp magicrescue$(EXE) dupemap$(EXE) magicsort $(INSTALLDIR)/bin/
+ 	cp recipes/* $(INSTALLDIR)/share/magicrescue/recipes/
+-	cp $(DOCS) $(INSTALLDIR)/man/man1
++	cp $(DOCS) $(INSTALLDIR)/share/man/man1
+ 	
+ 	for f in tools/*; do \
+ 	  if [ -x "$$f" ]; then \
+@@ -77,7 +77,7 @@ uninstall:
+ 	rm -f $(INSTALLDIR)/bin/dupemap$(EXE)
+ 	rm -f $(INSTALLDIR)/bin/magicsort
+ 	for f in $(DOCS); do \
+-	   rm -f "$(INSTALLDIR)/man/man1/`basename $$f`"; \
++	   rm -f "$(INSTALLDIR)/share/man/man1/`basename $$f`"; \
+ 	done
+ 	rm -rf $(INSTALLDIR)/share/magicrescue/tools
+ 	rm -rf $(INSTALLDIR)/share/magicrescue/recipes
diff --git a/sysutils/magicrescue/pkg-plist b/sysutils/magicrescue/pkg-plist
index 47c79878dc86..6711bbfaaa05 100644
--- a/sysutils/magicrescue/pkg-plist
+++ b/sysutils/magicrescue/pkg-plist
@@ -1,43 +1,43 @@
 bin/dupemap
 bin/magicrescue
 bin/magicsort
-man/man1/dupemap.1.gz
-man/man1/magicrescue.1.gz
-man/man1/magicsort.1.gz
+share/man/man1/dupemap.1.gz
+share/man/man1/magicrescue.1.gz
+share/man/man1/magicsort.1.gz
 %%DATADIR%%/recipes/avi
 %%DATADIR%%/recipes/canon-cr2
 %%DATADIR%%/recipes/elf
 %%DATADIR%%/recipes/empathy
 %%DATADIR%%/recipes/flac
 %%DATADIR%%/recipes/flv
 %%DATADIR%%/recipes/gimp-xcf
 %%DATADIR%%/recipes/gpl
 %%DATADIR%%/recipes/gzip
 %%DATADIR%%/recipes/jpeg-exif
 %%DATADIR%%/recipes/jpeg-jfif
 %%DATADIR%%/recipes/mbox
 %%DATADIR%%/recipes/mbox-mozilla-inbox
 %%DATADIR%%/recipes/mbox-mozilla-sent
 %%DATADIR%%/recipes/mp3-id3v1
 %%DATADIR%%/recipes/mp3-id3v2
 %%DATADIR%%/recipes/msoffice
 %%DATADIR%%/recipes/nikon-raw
 %%DATADIR%%/recipes/perl
 %%DATADIR%%/recipes/png
 %%DATADIR%%/recipes/ppm
 %%DATADIR%%/recipes/rar
 %%DATADIR%%/recipes/sqlite
 %%DATADIR%%/recipes/zip
 %%DATADIR%%/tools/checkrecipe
 %%DATADIR%%/tools/elfextract.pl
 %%DATADIR%%/tools/gimp-resave.pl
 %%DATADIR%%/tools/gzip_rename.pl
 %%DATADIR%%/tools/inputseek
 %%DATADIR%%/tools/laola.pl
 %%DATADIR%%/tools/mp3extract.pl
 %%DATADIR%%/tools/ole_rename.pl
 %%DATADIR%%/tools/oleextract.pl
 %%DATADIR%%/tools/pngextract.pl
 %%DATADIR%%/tools/safecat
 %%DATADIR%%/tools/script_rename.pl
 %%DATADIR%%/tools/textextract