diff --git a/textproc/docdiff/Makefile b/textproc/docdiff/Makefile
index ca86b11f3710..e83db66875ae 100644
--- a/textproc/docdiff/Makefile
+++ b/textproc/docdiff/Makefile
@@ -9,27 +9,30 @@ MASTER_SITES=	SF
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Compares two text files by word, by character, or by line
 
+LICENSE=	BSD3CLAUSE
+
 OPTIONS_DEFINE=	DOCS
 
 NO_BUILD=	yes
 USE_RUBY=	yes
 USE_RUBY_FEATURES=	iconv
+USES=		shebangfix
 
 PORTDOCS=	readme.html readme.en.html readme.ja.html
 
+SHEBANG_FILES=	${PORTNAME}.rb
+
 post-patch:
-	@${REINPLACE_CMD} \
-		-e '1 s|#!.*|#!${RUBY}|' \
-		-e '/ :format/ s|html|tty|' \
+	@${REINPLACE_CMD} -e '/ :format/ s|html|tty|' \
 		-e '/SystemConfigFileName =/ s|etc.*conf|${PREFIX}/etc/${PORTNAME}.conf|' \
-		-e 's|/etc/docdiff/docdiff.conf|${PREFIX}/etc/${PORTNAME}.conf|' \
+		-e 's|/etc/${PORTNAME}/${PORTNAME}.conf|${PREFIX}/etc/${PORTNAME}.conf|' \
 			${WRKSRC}/${PORTNAME}.rb
 
 do-install:
-	cd ${WRKSRC}/${PORTNAME} && ${COPYTREE_SHARE} . ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME}
+	cd ${WRKSRC}/${PORTNAME}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME}/
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.rb ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.example ${STAGEDIR}${PREFIX}/etc
-	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf.example ${STAGEDIR}${PREFIX}/etc/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>