diff --git a/graphics/npretty/Makefile b/graphics/npretty/Makefile
index e4f35330fda6..6e300248834f 100644
--- a/graphics/npretty/Makefile
+++ b/graphics/npretty/Makefile
@@ -11,31 +11,31 @@ MASTER_SITES=	http://www.pulia.nu/code/projects/npretty/ \
 MAINTAINER=	peter@pean.org
 COMMENT=	Simple web-gallery generator written in perl
 
-RUN_DEPENDS=	p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool \
-		convert:${PORTSDIR}/graphics/ImageMagick \
-		p5-forks>=0:${PORTSDIR}/devel/p5-forks
+LICENSE=	GPLv2
 
-LIB_DEPENDS+=	libMagickCore-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS=	p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool \
+		p5-forks>=0:${PORTSDIR}/devel/p5-forks
+LIB_DEPENDS=	libMagickCore-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
 
 NO_BUILD=	yes
-USES=		perl5
+USES=		perl5 shebangfix
 USE_PERL5=	run
+SHEBANG_FILES=	npretty.pl
+
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 post-patch:
 	@ ${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" ${WRKSRC}/npretty.pl
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/npretty.pl ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/etc/npretty
-	${INSTALL_DATA} ${WRKSRC}/novideo.gif ${PREFIX}/etc/npretty
-	${INSTALL_DATA} ${WRKSRC}/npretty_template.tpl ${PREFIX}/etc/npretty
-	${INSTALL_DATA} ${WRKSRC}/npretty.conf ${PREFIX}/etc/npretty
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for f in BUGS COPYING README
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/npretty.pl ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/npretty
+	${INSTALL_DATA} ${WRKSRC}/novideo.gif ${STAGEDIR}${PREFIX}/etc/npretty
+	${INSTALL_DATA} ${WRKSRC}/npretty_template.tpl ${STAGEDIR}${PREFIX}/etc/npretty
+	${INSTALL_DATA} ${WRKSRC}/npretty.conf ${STAGEDIR}${PREFIX}/etc/npretty
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for f in BUGS README
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/npretty/pkg-plist b/graphics/npretty/pkg-plist
index a34d3e241e2c..5c3427739c6b 100644
--- a/graphics/npretty/pkg-plist
+++ b/graphics/npretty/pkg-plist
@@ -3,7 +3,6 @@ etc/npretty/npretty.conf
 etc/npretty/novideo.gif
 etc/npretty/npretty_template.tpl
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README
 @dirrm etc/npretty
 %%PORTDOCS%%@dirrm %%DOCSDIR%%