diff --git a/converters/convmv/Makefile b/converters/convmv/Makefile
index 496b68db8dd6..90749b6a8939 100644
--- a/converters/convmv/Makefile
+++ b/converters/convmv/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	convmv
 PORTVERSION=	2.05
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	http://www.j3e.de/linux/convmv/ \
 		http://www.sfr-fresh.com/unix/privat/
 
 MAINTAINER=	kcwu@csie.org
 COMMENT=	Convert filenames from one encoding to another
 WWW=		https://j3e.de/linux/convmv/man/
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 LICENSE_FILE_GPLv2=	${WRKSRC}/GPL2
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	convmv
 NO_ARCH=	yes
-PLIST_FILES=	bin/convmv man/man1/convmv.1.gz
+PLIST_FILES=	bin/convmv share/man/man1/convmv.1.gz
 
 .include <bsd.port.mk>
diff --git a/converters/convmv/files/patch-Makefile b/converters/convmv/files/patch-Makefile
index e1290f0e8d24..3e48ab4c8631 100644
--- a/converters/convmv/files/patch-Makefile
+++ b/converters/convmv/files/patch-Makefile
@@ -1,25 +1,25 @@
 --- Makefile.orig	2008-11-29 13:49:38 UTC
 +++ Makefile
 @@ -1,6 +1,6 @@
  DESTDIR=
 -PREFIX=/usr/local
 -MANDIR=$(PREFIX)/share/man
 +PREFIX?=/usr/local
-+MANDIR=$(PREFIX)/man
++MANDIR=$(PREFIX)/share/man
  TAR=tar
  FIND=find
  SED=sed
 @@ -10,11 +10,11 @@ all: manpage
  install: all
  	mkdir -p $(DESTDIR)$(MANDIR)/man1/
  	mkdir -p $(DESTDIR)$(PREFIX)/bin/
 -	cp convmv.1.gz $(DESTDIR)$(MANDIR)/man1/
 +	cp convmv.1 $(DESTDIR)$(MANDIR)/man1/
  	install -m 755 convmv $(DESTDIR)$(PREFIX)/bin/
  
  manpage:
 -	pod2man --section 1 --center=" " convmv | gzip > convmv.1.gz
 +	pod2man --section 1 --center=" " convmv > convmv.1
  
  clean:
  	rm -f convmv.1.gz convmv-*.tar.gz MD5sums SHA256sums .files .name