diff --git a/security/spass/Makefile b/security/spass/Makefile
index 925d59c1f83b..c98feed49535 100644
--- a/security/spass/Makefile
+++ b/security/spass/Makefile
@@ -4,7 +4,6 @@ PORTNAME=	spass
 PORTVERSION=	3.0
 PORTREVISION=	1
 CATEGORIES=	security
-MASTER_SITES=	http://cloud.github.com/downloads/guyru/spass/
 
 MAINTAINER=	eadler@FreeBSD.org
 COMMENT=	Secure password generator with a true random number generator
@@ -15,8 +14,12 @@ BUILD_DEPENDS=	${LOCALBASE}/include/boost/format.hpp:${PORTSDIR}/devel/boost-lib
 LIB_DEPENDS=	asound:${PORTSDIR}/audio/alsa-lib \
 		boost_program_options:${PORTSDIR}/devel/boost-libs
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	guyru
+GH_TAGNAME=	cb0de64
+GH_COMMIT=	cb0de64
+
 USE_CMAKE=	yes
-USE_BZIP2=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib