diff --git a/graphics/import-pictures/Makefile b/graphics/import-pictures/Makefile
index 9eb05c18c8a1..23a5b5020e82 100644
--- a/graphics/import-pictures/Makefile
+++ b/graphics/import-pictures/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	import-pictures
 PORTVERSION=	1.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.nagilum.org/unix/
 
@@ -15,27 +16,26 @@ RUN_DEPENDS=	p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool \
 		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
 		p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules
 
-USE_BZIP2=	yes
-USES=		gmake perl5
-
-PLIST_FILES=	bin/${PORTNAME}
+USES=		gmake perl5 shebangfix tar:bzip2
 
 MAN1=		${PORTNAME}.1
 
+PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
+
 PORTDOCS=	import-pictures.html
 
-NO_STAGE=	yes
-
+SHEBANG_FILES=	${WRKSRC}/${PORTNAME}
+SHEBANG_LANG=	perl
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${STAGEDIR}${MAN1PREFIX}/man/man1
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>