diff --git a/www/phalcon/Makefile b/www/phalcon/Makefile
index 0a8bf02f3455..8d0768534c22 100644
--- a/www/phalcon/Makefile
+++ b/www/phalcon/Makefile
@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	phalcon
-PORTVERSION=	0.9.0
+PORTVERSION=	1.0.0
 CATEGORIES=	www
-MASTER_SITES=	https://github.com/${PORTNAME}/c${PORTNAME}/tarball/${GITVERSION}/
-DISTNAME=	${PORTNAME}-c${PORTNAME}-${GITVERSION}
 
 MAINTAINER=	linpct@gmail.com
 COMMENT=	Phalcon PHP Framework written in C-language
@@ -13,12 +11,18 @@ COMMENT=	Phalcon PHP Framework written in C-language
 BUILD_DEPENDS=	${LOCALBASE}/include/php/ext/pdo/php_pdo_driver.h:${PORTSDIR}/databases/php5-pdo
 RUN_DEPENDS=	${LOCALBASE}/include/php/ext/pdo/php_pdo_driver.h:${PORTSDIR}/databases/php5-pdo
 
-GITVERSION=	7b3b060
+USE_GITHUB=	yes
+GH_ACCOUNT=	${PORTNAME}
+GH_PROJECT=	c${PORTNAME}
+GH_TAGNAME=	1.0.0
+GH_COMMIT=	0d052fc
+
 FETCH_ARGS=	-pRr
-WRKSRC=		${WRKDIR}/${PORTNAME}-c${PORTNAME}-${GITVERSION}/build/
+WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}/build/
 
 CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ARGS=	--enable-phalcon --prefix=${PREFIX} --with-php-config=${LOCALBASE}/bin/php-config
+CONFIGURE_ARGS=	--enable-phalcon --prefix=${PREFIX} \
+		--with-php-config=${LOCALBASE}/bin/php-config
 
 USE_PHP=	yes
 USE_PHPEXT=	yes
diff --git a/www/phalcon/distinfo b/www/phalcon/distinfo
index 1712de7ebe5a..b1e564a99d73 100644
--- a/www/phalcon/distinfo
+++ b/www/phalcon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (phalcon-cphalcon-7b3b060.tar.gz) = 310a5674f3cd9e87af5f58fa70c1c9880cbf818db0d1409a7d5eda87cfc2cf0c
-SIZE (phalcon-cphalcon-7b3b060.tar.gz) = 2045250
+SHA256 (phalcon-1.0.0.tar.gz) = 091ba6f425df16f5249a1f4cf80b48df729e7ba0a9ec0fdec17cb8b71f15c72b
+SIZE (phalcon-1.0.0.tar.gz) = 2159006