diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile
index 8bf80f1a77e5..a7a07d937fef 100644
--- a/ports-mgmt/poudriere-devel/Makefile
+++ b/ports-mgmt/poudriere-devel/Makefile
@@ -1,12 +1,13 @@
 # $FreeBSD$
 
 PORTNAME=	poudriere
-PORTVERSION=	3.0.99.20140916
+PORTVERSION=	3.0.99.20140919
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
-		http://fossil.etoilebsd.net/poudriere/tarball/
+		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
+		GH
 PKGNAMESUFFIX=	-devel
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz?uuid=${FSL_CHKIN}
+DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-0-g${GH_COMMIT}
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Port build and test system
@@ -15,7 +16,10 @@ LICENSE=	BSD2CLAUSE
 
 CONFLICTS_INSTALL=	poudriere-[0-9]*
 
-FSL_CHKIN=	d7e95d9102
+USE_GITHUB=	yes
+GH_ACCOUNT=	freebsd
+GH_COMMIT=	4555dff
+GH_TAGNAME=	${GH_COMMIT}
 
 GNU_CONFIGURE=	yes
 ETCDIR=		${PREFIX}/etc/poudriere.d
diff --git a/ports-mgmt/poudriere-devel/distinfo b/ports-mgmt/poudriere-devel/distinfo
index 92c1b00f61e6..016bd4c1e53e 100644
--- a/ports-mgmt/poudriere-devel/distinfo
+++ b/ports-mgmt/poudriere-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (poudriere-3.0.99.20140916.tar.gz?uuid=d7e95d9102) = 5a67b992807a9d40390100b5cb22a4d3bffc0a379559f05054d8df05723e1d4a
-SIZE (poudriere-3.0.99.20140916.tar.gz?uuid=d7e95d9102) = 2702849
+SHA256 (freebsd-poudriere-3.0.99.20140919-0-g4555dff.tar.gz) = 423af9e296b60b06d985657b93ea4dd9ef53cd2942093ef302bfe851d87d65e3
+SIZE (freebsd-poudriere-3.0.99.20140919-0-g4555dff.tar.gz) = 2710427
diff --git a/ports-mgmt/poudriere-devel/pkg-descr b/ports-mgmt/poudriere-devel/pkg-descr
index 13bbea4cce39..3e950072cf23 100644
--- a/ports-mgmt/poudriere-devel/pkg-descr
+++ b/ports-mgmt/poudriere-devel/pkg-descr
@@ -2,4 +2,4 @@ poudriere is a tool primarily designed to test package production on
 FreeBSD. However, most people will find it useful to bulk build ports
 for FreeBSD.
 
-WWW: http://fossil.etoilebsd.net/poudriere
+WWW: https://github.com/freebsd/poudriere/wiki