diff --git a/x11-fonts/alegreya-sans/Makefile b/x11-fonts/alegreya-sans/Makefile
index d7bae9e7ad5b..b4e6c44cfd9d 100644
--- a/x11-fonts/alegreya-sans/Makefile
+++ b/x11-fonts/alegreya-sans/Makefile
@@ -1,26 +1,28 @@
 # $FreeBSD$
 
 PORTNAME=	alegreya-sans
-PORTVERSION=	20140108
+PORTVERSION=	1.002
+PORTEPOCH=	1
 CATEGORIES=	x11-fonts
-MASTER_SITES=	http://www.huertatipografica.com/free_download/G4oDzW61NXb23OxBa8XL?dummy=
 
 MAINTAINER=	rakuco@FreeBSD.org
 COMMENT=	Humanist sans serif font with a calligraphic feeling
 
 LICENSE=	OFL11
 
-FETCH_BEFORE_ARGS=	-o ${DISTFILES}
+USE_GITHUB=	yes
+GH_ACCOUNT=	juandelperal
+GH_PROJECT=	Alegreya-Sans
+GH_TAGNAME=	2d2a4b0
+GH_COMMIT=	2d2a4b0
 
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
-USE_ZIP=	yes
 
 FONTDIR=	${STAGEDIR}${PREFIX}/lib/X11/fonts/${PORTNAME}
 
 do-install:
 	${MKDIR} ${FONTDIR}
-	cd ${WRKSRC} && \
+	cd ${WRKSRC}/otf && \
 		${INSTALL_DATA} *.otf ${FONTDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/alegreya-sans/distinfo b/x11-fonts/alegreya-sans/distinfo
index 3166615165c7..70ca383a558e 100644
--- a/x11-fonts/alegreya-sans/distinfo
+++ b/x11-fonts/alegreya-sans/distinfo
@@ -1,2 +1,2 @@
-SHA256 (alegreya-sans-20140108.zip) = 6fe20e1857bda2fa6b5b33147c84c4975b5fa4ec1ce6459d160c3d394d162b37
-SIZE (alegreya-sans-20140108.zip) = 1573210
+SHA256 (alegreya-sans-1.002.tar.gz) = e5a81b22aa8f7cf35583b051cee78ce5f9dba7dbcc75f2f8bc2508d03043c722
+SIZE (alegreya-sans-1.002.tar.gz) = 4954547