diff --git a/devel/cgit/Makefile b/devel/cgit/Makefile
index 172b1fa18007..3e85524121ad 100644
--- a/devel/cgit/Makefile
+++ b/devel/cgit/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	cgit
-PORTVERSION=	0.9.0.3
+PORTVERSION=	0.9.1
 CATEGORIES=	devel www
-MASTER_SITES=	http://hjemli.net/git/cgit/snapshot/:cgit \
-		${MASTER_SITE_KERNEL_ORG:S/$/:git/g}
-MASTER_SITE_SUBDIR=	software/scm/git/:git
+MASTER_SITES=	http://git.zx2c4.com/cgit/snapshot/:cgit \
+		http://mirror.linux.org.au/software/scm/git/:git
 DISTFILES=	cgit-${PORTVERSION}${EXTRACT_SUFX}:cgit \
 		git-${GIT_VERSION}.tar.bz2:git
 
diff --git a/devel/cgit/distinfo b/devel/cgit/distinfo
index d8ec163851ac..b1a9769ed0f3 100644
--- a/devel/cgit/distinfo
+++ b/devel/cgit/distinfo
@@ -1,4 +1,4 @@
-SHA256 (cgit-0.9.0.3.tar.bz2) = 53ccf0c826f91c2184ec29b1b9ab8a6f42e0ef2e6fa9042c3759e2a2dc81baa5
-SIZE (cgit-0.9.0.3.tar.bz2) = 64578
+SHA256 (cgit-0.9.1.tar.bz2) = d3db46a69f731182f563f62cd978543fa40d01899cf17aa9764e4d339ab0e72c
+SIZE (cgit-0.9.1.tar.bz2) = 67574
 SHA256 (git-1.7.4.tar.bz2) = 8e260b9e5dfb46a35f26e3db450c2dabb4d1df254bfb2820779945a1ecbcef51
 SIZE (git-1.7.4.tar.bz2) = 2703735
diff --git a/devel/cgit/pkg-descr b/devel/cgit/pkg-descr
index 6aae96ccbb6c..98926d524099 100644
--- a/devel/cgit/pkg-descr
+++ b/devel/cgit/pkg-descr
@@ -1,4 +1,4 @@
 Cgit is an attempt to create a fast web interface for the git scm, using
 a builtin cache to decrease server io-pressure.
 
-WWW: http://hjemli.net/git/
+WWW: http://git.zx2c4.com/cgit/about/
diff --git a/devel/cgit/pkg-plist b/devel/cgit/pkg-plist
index 87cd71c392d5..763648ed111f 100644
--- a/devel/cgit/pkg-plist
+++ b/devel/cgit/pkg-plist
@@ -9,5 +9,5 @@ lib/cgit/filters/syntax-highlighting.sh
 @dirrm lib/cgit
 @dirrm %%WWWDIR%%
 @exec mkdir -p /var/cache/%%PORTNAME%%
-@unexec rmdir /var/cache/%%PORTNAME%% 2>/dev/null || true
-@unexec rmdir /var/cache  2>/dev/null || true
+@dirrmtry /var/cache/%%PORTNAME%%
+@dirrmtry /var/cache/