diff --git a/www/mod_auth_openid/Makefile b/www/mod_auth_openid/Makefile
index c4b6f0408a7d..a1d10e8e94a8 100644
--- a/www/mod_auth_openid/Makefile
+++ b/www/mod_auth_openid/Makefile
@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	mod_auth_openid
-PORTVERSION=	0.7
-PORTREVISION=	1
+PORTVERSION=	0.8
 CATEGORIES=	www
-MASTER_SITES=	http://cloud.github.com/downloads/bmuller/mod_auth_openid/
 PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -14,15 +12,27 @@ COMMENT=	Authentication module for the Apache 2 webserver with OpenID
 LIB_DEPENDS=	libopkele.so:${PORTSDIR}/devel/libopkele \
 		libsqlite3.so:${PORTSDIR}/databases/sqlite3
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	bmuller
+GH_TAGNAME=	v${PORTVERSION}
+GH_COMMIT=	22d1719
 
 PLIST_FILES=	${APACHEMODDIR}/mod_auth_openid.so
 
-USE_APACHE=	22
-USES=		gmake pkgconfig
+USE_APACHE=	22+
+USES=		gmake pkgconfig libtool
+USE_AUTOTOOLS=	aclocal libtoolize autoconf automake autoheader
+AUTOMAKE_ARGS=	--add-missing
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pcre=${LOCALBASE}
 
 CFLAGS+=	-I${LOCALBASE}/include -I/usr/include/openssl
 
-NO_STAGE=	yes
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${APXS} -i|$${APXS} -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} -i|' \
+		${WRKSRC}/src/Makefile.am
+
+pre-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
+
 .include <bsd.port.mk>
diff --git a/www/mod_auth_openid/distinfo b/www/mod_auth_openid/distinfo
index c43b88c19434..d54a36ebf3bd 100644
--- a/www/mod_auth_openid/distinfo
+++ b/www/mod_auth_openid/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mod_auth_openid-0.7.tar.gz) = 58cb927121d39557a3593b10db8c960440295fb49cddf8120d6a5b521877ed4c
-SIZE (mod_auth_openid-0.7.tar.gz) = 352757
+SHA256 (mod_auth_openid-0.8.tar.gz) = da00ed1ae442fe73e6d48e46f64ed0b85942a3b8f7be3cae40870b117ccc15e5
+SIZE (mod_auth_openid-0.8.tar.gz) = 28424