diff --git a/audio/glyr/Makefile b/audio/glyr/Makefile
index 62fa8c0e5e5..e60112c1ef2 100644
--- a/audio/glyr/Makefile
+++ b/audio/glyr/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2013/08/11 14:59:54 landry Exp $
+# $OpenBSD: Makefile,v 1.2 2013/11/12 15:00:25 sthen Exp $
 
 COMMENT =	music related metadata searchengine
-V =		1.0.1
-DISTNAME =	glyr-${V}
+GH_VER =	1.0.1
+DISTNAME =	glyr-${GH_VER}
 CATEGORIES =	audio net
 SHARED_LIBS +=	glyr	0.0 # 1.1
 
@@ -11,7 +11,8 @@ HOMEPAGE =	https://github.com/sahib/glyr
 # GPLv3+
 PERMIT_PACKAGE_CDROM =		Yes
 
-MASTER_SITES =	https://github.com/sahib/glyr/archive/${V}.tar.gz?bleh=/
+MASTER_SITES =	https://github.com/sahib/glyr/archive/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}{${GH_VER}${EXTRACT_SUFX}}
 
 MODULES =	devel/cmake \
 		devel/gettext
diff --git a/devel/libgit2/Makefile.inc b/devel/libgit2/Makefile.inc
index 7d066fc3a7f..e441160c15d 100644
--- a/devel/libgit2/Makefile.inc
+++ b/devel/libgit2/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.8 2013/08/07 21:57:45 naddy Exp $
+# $OpenBSD: Makefile.inc,v 1.9 2013/11/12 15:00:25 sthen Exp $
 
 SHARED_ONLY?=		Yes
 
@@ -9,6 +9,5 @@ HOMEPAGE=		http://libgit2.github.com/
 # GPLv2 with linking exemption.
 PERMIT_PACKAGE_CDROM?=	Yes
 
-MASTER_SITES?=		https://github.com/libgit2/${PROJECT}/archive/v${V}.tar.gz?dummy=/
 DIST_SUBDIR=		libgit
 DISTNAME?=		${PROJECT}-${V}
diff --git a/devel/libgit2/libgit2/Makefile b/devel/libgit2/libgit2/Makefile
index 100ca301ef5..87a9202d8f3 100644
--- a/devel/libgit2/libgit2/Makefile
+++ b/devel/libgit2/libgit2/Makefile
@@ -1,12 +1,16 @@
-# $OpenBSD: Makefile,v 1.10 2013/07/09 10:09:44 jasper Exp $
+# $OpenBSD: Makefile,v 1.11 2013/11/12 15:00:25 sthen Exp $
 
 COMMENT=		the Git library, take 2
 
-V=			0.19.0
+GH_VER=			v0.19.0
+V=			${GH_VER:S/v//}
 PROJECT=		libgit2
 REVISION=		0
 SHARED_LIBS +=  git2                      4.0 # 0.19
 
+MASTER_SITES=		https://github.com/libgit2/${PROJECT}/archive/
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX}{${GH_VER}${EXTRACT_SUFX}}
+
 MODULES=		devel/cmake \
 			lang/python
 
diff --git a/devel/lua-penlight/Makefile b/devel/lua-penlight/Makefile
index 28f9a857f0e..9d6b4717f8b 100644
--- a/devel/lua-penlight/Makefile
+++ b/devel/lua-penlight/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2013/09/30 13:04:06 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.6 2013/11/12 15:00:25 sthen Exp $
 
 COMMENT =	pure Lua libraries focusing on input data handling
 
-VER =		1.3.1
-DISTNAME =	Penlight-${VER}
-PKGNAME =	lua-penlight-${VER}
+GH_VER =	1.3.1
+DISTNAME =	Penlight-${GH_VER}
+PKGNAME =	lua-penlight-${GH_VER}
 CATEGORIES =	devel
 
 HOMEPAGE =	http://stevedonovan.github.io/Penlight/
@@ -16,7 +16,8 @@ PERMIT_PACKAGE_CDROM =Yes
 
 MODULES =	lang/lua
 
-MASTER_SITES =	https://github.com/stevedonovan/Penlight/archive/${VER}.tar.gz?bleh=/
+MASTER_SITES =	https://github.com/stevedonovan/Penlight/archive/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}{${GH_VER}${EXTRACT_SUFX}}
 
 MODLUA_RUN_DEPENDS =	devel/luafs
 
diff --git a/devel/lualdoc/Makefile b/devel/lualdoc/Makefile
index 4a968615e33..f8b9e9e2573 100644
--- a/devel/lualdoc/Makefile
+++ b/devel/lualdoc/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2013/09/23 14:11:12 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.6 2013/11/12 15:00:25 sthen Exp $
 
 COMMENT =	LuaDoc-compatible documentation generation system
 
-VER =		1.4.0
-DISTNAME =	LDoc-${VER}
-PKGNAME =	lualdoc-${VER}
+GH_VER =	1.4.0
+DISTNAME =	LDoc-${GH_VER}
+PKGNAME =	lualdoc-${GH_VER}
 CATEGORIES =	devel
 
 HOMEPAGE =	http://stevedonovan.github.io/ldoc/
@@ -16,7 +16,8 @@ PERMIT_PACKAGE_CDROM =Yes
 
 MODULES =	lang/lua
 
-MASTER_SITES =	https://github.com/stevedonovan/ldoc/archive/${VER}.tar.gz?bleh=/
+MASTER_SITES =	https://github.com/stevedonovan/ldoc/archive/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}{${GH_VER}${EXTRACT_SUFX}}
 
 MODLUA_RUN_DEPENDS =	devel/lua-penlight
 
diff --git a/devel/ninja/Makefile b/devel/ninja/Makefile
index 749c5d37a33..5c82b7e3020 100644
--- a/devel/ninja/Makefile
+++ b/devel/ninja/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.5 2013/10/16 05:52:46 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.6 2013/11/12 15:00:25 sthen Exp $
 
 COMMENT =		small build system with a focus on speed
-V =			1.4.0
-DISTNAME =		ninja-${V}
+GH_VER =		v1.4.0
+DISTNAME =		ninja-${GH_VER:S/v//}
 CATEGORIES =		devel
 HOMEPAGE =		http://martine.github.io/ninja/
 MAINTAINER =		Matthew Dempsky <matthew@dempsky.org>
@@ -13,7 +13,8 @@ PERMIT_PACKAGE_CDROM =	Yes
 # c>=68.1 needed for ppoll
 WANTLIB =		c>=68.1 m stdc++
 
-MASTER_SITES =		https://github.com/martine/ninja/archive/v${V}.tar.gz?bleh=/
+MASTER_SITES =		https://github.com/martine/ninja/archive/
+DISTFILES =		${DISTNAME}${EXTRACT_SUFX}{${GH_VER}${EXTRACT_SUFX}}
 
 MODULES =		lang/python
 
diff --git a/www/tt-rss/Makefile b/www/tt-rss/Makefile
index f1682af149a..854fc4a04b2 100755
--- a/www/tt-rss/Makefile
+++ b/www/tt-rss/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.20 2013/09/23 06:43:11 landry Exp $
+# $OpenBSD: Makefile,v 1.21 2013/11/12 15:00:25 sthen Exp $
 
 COMMENT=		webbased rss reader with standalone look and feel
 
-V=			1.10
-DISTNAME=		Tiny-Tiny-RSS-$V
-PKGNAME=		tt-rss-$V
+GH_VER=			1.10
+DISTNAME=		Tiny-Tiny-RSS-${GH_VER}
+PKGNAME=		tt-rss-${GH_VER}
 CATEGORIES=		www
 
 HOMEPAGE=		http://tt-rss.org/
@@ -12,7 +12,8 @@ HOMEPAGE=		http://tt-rss.org/
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 
-MASTER_SITES=		https://github.com/gothfox/Tiny-Tiny-RSS/archive/${V}.tar.gz?dummy=/
+MASTER_SITES=		https://github.com/gothfox/Tiny-Tiny-RSS/archive/
+DISTFILES =		${DISTNAME}${EXTRACT_SUFX}{${GH_VER}${EXTRACT_SUFX}}
 
 NO_BUILD=		Yes
 NO_TEST=		Yes