diff --git a/audio/mp3lint/Makefile b/audio/mp3lint/Makefile
index f0314f91a812..a811756d1f70 100644
--- a/audio/mp3lint/Makefile
+++ b/audio/mp3lint/Makefile
@@ -1,30 +1,25 @@
 PORTNAME=	mp3lint
 PORTVERSION=	0.9
 PORTREVISION=	2
 CATEGORIES=	audio perl5
 MASTER_SITES=	https://erislabs.net/ianb/projects/mp3lint/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Configurable tool to check collections of audio files
 WWW=		https://erislabs.net/ianb/projects/mp3lint/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	p5-Pod-Parser>=0:textproc/p5-Pod-Parser \
 		${RUN_DEPENDS}
 RUN_DEPENDS=	libmp3-archive-perl>=0:audio/libmp3-archive-perl
 
 USES=		perl5
 USE_PERL5=	configure
 
 MAKE_JOBS_UNSAFE=	yes
 NO_ARCH=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e '/^INSTALLSYSCONFDIR/ s|/etc|${PREFIX}&|' \
-		-e '/^INSTALLSITEMAN5DIR/ s|/man|/share&|' \
-		${WRKSRC}/Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/audio/mp3lint/files/patch-Makefile.PL b/audio/mp3lint/files/patch-Makefile.PL
index 45ffffb53e4b..166b4cea75f5 100644
--- a/audio/mp3lint/files/patch-Makefile.PL
+++ b/audio/mp3lint/files/patch-Makefile.PL
@@ -1,11 +1,27 @@
 --- Makefile.PL.orig	2003-11-16 07:07:26 UTC
 +++ Makefile.PL
+@@ -39,13 +39,13 @@ DESTINSTALLMAN5DIR = $(DESTDIR)$(INSTALLMAN5DIR)
+ INST_MAN5DIR = blib/man5
+ INSTALLMAN5DIR = $(PREFIX)/man/man5
+ DESTINSTALLMAN5DIR = $(DESTDIR)$(INSTALLMAN5DIR)
+-INSTALLSITEMAN5DIR = $(SITEPREFIX)/man/man5
++INSTALLSITEMAN5DIR = $(SITEPREFIX)/share/man/man5
+ DESTINSTALLSITEMAN5DIR = $(DESTDIR)$(INSTALLSITEMAN5DIR)
+ INSTALLVENDORMAN5DIR = $(VENDORPREFIX)/man/man5
+ DESTINSTALLVENDORMAN5DIR = $(DESTDIR)$(INSTALLVENDORMAN5DIR)
+ MAN5EXT = 5
+ INST_SYSCONFDIR = blib/etc
+-INSTALLSYSCONFDIR = /etc
++INSTALLSYSCONFDIR = $(SITEPREFIX)/etc
+ DESTINSTALLSYSCONFDIR = $(DESTDIR)$(INSTALLSYSCONFDIR)	
+ # end mp3lint
+ 
 @@ -124,7 +124,7 @@ sub MY::install {
    my $self = shift;
    my $inherited = $self->SUPER::install(@_);
    my $conf="\t\t\$(INST_SYSCONFDIR) \$(DESTINSTALLSYSCONFDIR)";
 -  $inherited =~ s/(^\s*\$\(INST_MAN)3(DIR\s*.*MAN)3(DIR\))/${1}3${2}3$3 \\\n${1}5${2}5$3 \\\n$conf/gm;
 +  $inherited =~ s/(^\s*"?\$\(INST_MAN)3(DIR"?.*MAN)3(DIR\)"?)/${1}3${2}3$3 \\\n${1}5${2}5$3 \\\n$conf/gm;
  
    return $inherited;
  }