diff --git a/deskutils/jlj/Makefile b/deskutils/jlj/Makefile
index b711dd3d6a4f..01285a65242f 100644
--- a/deskutils/jlj/Makefile
+++ b/deskutils/jlj/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	jlj
-# Date created:				29 April 2001
-# Whom:					Pete Fritchman <petef@databits.net>
-#
+# Created by: Pete Fritchman <petef@databits.net>
 # $FreeBSD$
-#
 
 PORTNAME=	jlj
 PORTVERSION=	2.12
@@ -17,6 +13,7 @@ COMMENT=	Jerry's command-line LiveJournal.com entry system
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+USES=		shebangfix
 USE_PERL5_RUN=	yes
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
@@ -24,19 +21,20 @@ SUB_FILES=	pkg-message
 PLIST_FILES=	bin/jlj share/examples/jlj/dot.livejournal.rc
 PLIST_DIRS=	share/examples/jlj
 
-.if !defined(NOPORTDOCS)
+SHEBANG_FILES=	jlj.pl
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	README
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's!/usr/bin/perl!${PERL}!' ${WRKSRC}/jlj.pl
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/jlj.pl ${PREFIX}/bin/jlj
 	@${MKDIR} ${PREFIX}/share/examples/jlj
 	${INSTALL_DATA} ${WRKSRC}/.livejournal.rc \
 		${PREFIX}/share/examples/jlj/dot.livejournal.rc
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.JLJ ${DOCSDIR}/README
 .endif