diff --git a/devel/gitolite/Makefile b/devel/gitolite/Makefile
index 3ccc00984fbf..bd27df26ed5a 100644
--- a/devel/gitolite/Makefile
+++ b/devel/gitolite/Makefile
@@ -28,7 +28,7 @@ USES=		perl5
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	GITUSER
+OPTIONS_DEFINE=	GITUSER DOCS
 
 GITUSER_DESC=	Create git user as gitolite provider
 
@@ -52,25 +52,23 @@ post-patch:
 
 do-build:
 	echo "v${PORTVERSION}-0-g${GH_COMMIT}" > ${WRKSRC}/src/VERSION
-	@${MKDIR} ${WRKSRC}/lib
-	@${MV} ${WRKSRC}/src/lib/Gitolite ${WRKSRC}/lib/
-	@${RMDIR} ${WRKSRC}/src/lib
-	@${MV} ${WRKSRC}/check-g2-compat ${WRKSRC}/src/
-	@${MV} ${WRKSRC}/convert-gitosis-conf ${WRKSRC}/src/
+	${MKDIR} ${WRKSRC}/lib
+	${MV} ${WRKSRC}/src/lib/Gitolite ${WRKSRC}/lib/
+	${RMDIR} ${WRKSRC}/src/lib
+	${MV} ${WRKSRC}/check-g2-compat ${WRKSRC}/src/
+	${MV} ${WRKSRC}/convert-gitosis-conf ${WRKSRC}/src/
 
 post-build:
-	@${FIND} ${WRKSRC} -name "*.bak" -delete
-	@${FIND} ${WRKSRC} -name "*.orig" -delete
+	${FIND} ${WRKSRC} -name "*.bak" -delete
+	${FIND} ${WRKSRC} -name "*.orig" -delete
 
 do-install:
-	@(cd ${WRKSRC}/src && ${COPYTREE_BIN} \* ${STAGEDIR}${PREFIX}/libexec/gitolite)
-	@(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} Gitolite ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/)
-	@${LN} -s ${PREFIX}/libexec/gitolite/gitolite ${STAGEDIR}${PREFIX}/bin/gitolite
+	(cd ${WRKSRC}/src && ${COPYTREE_BIN} \* ${STAGEDIR}${PREFIX}/libexec/gitolite)
+	(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} Gitolite ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/)
+	${LN} -s ${PREFIX}/libexec/gitolite/gitolite ${STAGEDIR}${PREFIX}/bin/gitolite
 
-.if ${PORT_OPTIONS:MDOCS}
-	-@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/CHANGELOG ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>