diff -ruN /usr/ports/devel/gitolite/Makefile ./Makefile
--- /usr/ports/devel/gitolite/Makefile	2013-09-20 10:04:43.000000000 -0700
+++ ./Makefile	2013-10-27 21:45:56.000000000 -0700
@@ -1,11 +1,12 @@
 # $FreeBSD: devel/gitolite/Makefile 327723 2013-09-20 17:04:43Z bapt $
 
 PORTNAME=	gitolite
-PORTVERSION=	3.5.1
+PORTVERSION=	3.5.2
 PORTEPOCH=	1
 CATEGORIES=	devel
-MASTER_SITES=	http://milki.github.io/${PORTNAME}/ \
+MASTER_SITES=	GH \
 		LOCAL/tdb
+DISTNAME=	g-${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-${GH_COMMIT}
 
 MAINTAINER=	milki@rescomp.berkeley.edu
 COMMENT=	An access control layer on top of git
@@ -14,6 +15,11 @@
 
 RUN_DEPENDS=	git>=0:${PORTSDIR}/devel/git
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	sitaramc
+GH_COMMIT=	926bd5f
+GH_TAGNAME=	${GH_COMMIT}
+
 CONFLICTS=	gitolite-[^3]*
 
 USES=		perl5
@@ -24,7 +30,6 @@
 
 GITUSER_DESC=	Create git user as gitolite provider
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGITUSER}
@@ -44,6 +49,7 @@
 		-exec ${REINPLACE_CMD} -Ee 's|#!/bin/bash|#!${LOCALBASE}/bin/bash|' {} \;
 
 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
@@ -55,21 +61,13 @@
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
 
 do-install:
-	@(cd ${WRKSRC}/src && ${COPYTREE_BIN} \* ${PREFIX}/libexec/gitolite)
-	@(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} Gitolite ${PREFIX}/${SITE_PERL_REL}/)
-	@${LN} -s ${PREFIX}/libexec/gitolite/gitolite ${PREFIX}/bin/gitolite
+	@(cd ${WRKSRC}/src && ${COPYTREE_BIN} \* ${STAGEDIR}${PREFIX}/libexec/gitolite)
+	@(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} Gitolite ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/)
 
 post-install:
-.if ! ${PORT_OPTIONS:MDOCS}
-	-@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${DOCSDIR}
-.endif
-
-	@${CAT} ${PKGMESSAGE}
-
-.if ! ${PORT_OPTIONS:MDOCS}
-PORTDOCS=	README.txt CHANGELOG
-.endif
+	-@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${STAGEDIR}${DOCSDIR}
+	${LN} -sf ../libexec/gitolite/gitolite ${STAGEDIR}${PREFIX}/bin/gitolite
 
 .include <bsd.port.mk>
diff -ruN /usr/ports/devel/gitolite/distinfo ./distinfo
--- /usr/ports/devel/gitolite/distinfo	2013-04-24 10:54:05.000000000 -0700
+++ ./distinfo	2013-10-27 00:23:04.000000000 -0700
@@ -1,2 +1,2 @@
-SHA256 (gitolite-3.5.1.tar.gz) = b527e90ea6aa0f0d5496b3e520cc4a461b130a91b1b284ffee1f20865fada7cf
-SIZE (gitolite-3.5.1.tar.gz) = 128763
+SHA256 (g-sitaramc-gitolite-3.5.2-926bd5f.tar.gz) = ec57c49103fabbe3f919b72e3b50dbca25504a8482f5ba2a681e0ef941473548
+SIZE (g-sitaramc-gitolite-3.5.2-926bd5f.tar.gz) = 131354
diff -ruN /usr/ports/devel/gitolite/gitolite.patch ./gitolite.patch
--- /usr/ports/devel/gitolite/gitolite.patch	1969-12-31 16:00:00.000000000 -0800
+++ ./gitolite.patch	2013-10-27 21:49:08.000000000 -0700
@@ -0,0 +1,3 @@
diff -ruN /usr/ports/devel/gitolite/pkg-plist ./pkg-plist
--- /usr/ports/devel/gitolite/pkg-plist	2013-04-24 10:54:05.000000000 -0700
+++ ./pkg-plist	2013-10-27 21:46:16.000000000 -0700
@@ -1,4 +1,6 @@
 bin/gitolite
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%SITE_PERL%%/Gitolite/Common.pm
 %%SITE_PERL%%/Gitolite/Conf.pm
 %%SITE_PERL%%/Gitolite/Conf/Explode.pm
@@ -77,7 +79,6 @@
 libexec/gitolite/triggers/renice
 libexec/gitolite/triggers/set-default-roles
 libexec/gitolite/triggers/upstream
-%%GITUSER%%@dirrmtry git
 @dirrm libexec/gitolite/triggers/post-compile
 @dirrm libexec/gitolite/triggers
 @dirrm libexec/gitolite/syntactic-sugar
@@ -89,4 +90,3 @@
 @dirrm %%SITE_PERL%%/Gitolite/Hooks
 @dirrm %%SITE_PERL%%/Gitolite/Conf
 @dirrm %%SITE_PERL%%/Gitolite
-@dirrm %%SITE_PERL%%