diff -urN /usr/ports/net-im/telegram.old/Makefile /usr/ports/net-im/telegram/Makefile
--- /usr/ports/net-im/telegram.old/Makefile	2015-08-06 07:30:26.000000000 +0200
+++ /usr/ports/net-im/telegram/Makefile	2015-08-31 10:43:05.813725000 +0200
@@ -4,16 +4,11 @@
 PORTNAME=	telegram
 PORTVERSION=	1.3.1
 CATEGORIES=	net-im
-MASTER_SITES=	http://github.com/vysheng/tg/archive/:source1 \
-		http://github.com/vysheng/tgl/archive/:source2 \
-		http://github.com/vysheng/tl-parser/archive/:source3
-DISTFILES=	1.3.1.tar.gz:source1 2.0.1.tar.gz:source2 master.zip:source3
 
 MAINTAINER=	cpm@fbsd.es
 COMMENT=	Command-line interface for Telegram
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libconfig.so:${PORTSDIR}/devel/libconfig \
     		libevent.so:${PORTSDIR}/devel/libevent2 \
@@ -23,7 +18,12 @@
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 
-WRKSRC=	${WRKDIR}/tg-1.3.1
+USE_GITHUB=	yes
+GH_ACCOUNT=	vysheng
+GH_PROJECT=	tg:telegram tgl tl-parser:tlparser
+GH_TAGNAME=	1.3.1:telegram 2.0.1 1659d87:tlparser
+
+WRKSRC=		${WRKDIR}/tg-1.3.1
 
 PLIST_FILES=	bin/telegram-cli \
 		etc/telegram-cli/server.pub
@@ -36,8 +36,10 @@
 .endif
 
 post-extract:
-	@${MV} ${WRKDIR}/tgl-2.0.1/* ${WRKSRC}/tgl
-	@${MV} ${WRKDIR}/tl-parser-master/* ${WRKSRC}/tgl/tl-parser
+	@${RM} -r ${WRKSRC}/tgl
+	@${MV} ${WRKDIR}/tgl-2.0.1 ${WRKSRC}/tgl
+	@${MV} ${WRKDIR}/tl-parser-1659d87/* ${WRKSRC}/tgl/tl-parser
+	@${RM} -r ${WRKDIR}/tl-parser-1659d87
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/telegram-cli
diff -urN /usr/ports/net-im/telegram.old/distinfo /usr/ports/net-im/telegram/distinfo
--- /usr/ports/net-im/telegram.old/distinfo	2015-08-06 07:30:26.000000000 +0200
+++ /usr/ports/net-im/telegram/distinfo	2015-08-31 10:31:24.240092000 +0200
@@ -1,6 +1,6 @@
-SHA256 (1.3.1.tar.gz) = b70b1d8b97b44086b64e467f81c6aceb8263092c26a8cf1a7d717eb1b5360415
-SIZE (1.3.1.tar.gz) = 278051
-SHA256 (2.0.1.tar.gz) = 549bbfc46715bae31b50a54cc21eefd61109cd28dcdddbe4e53726aec3d924f1
-SIZE (2.0.1.tar.gz) = 250488
-SHA256 (master.zip) = 14e9c78dae2b32acaf845121725ab694e21276959f07242470ebb39a1934fdf5
-SIZE (master.zip) = 82671
+SHA256 (vysheng-tgl-1.3.1-2.0.1_GH0.tar.gz) = 549bbfc46715bae31b50a54cc21eefd61109cd28dcdddbe4e53726aec3d924f1
+SIZE (vysheng-tgl-1.3.1-2.0.1_GH0.tar.gz) = 250488
+SHA256 (vysheng-tg-1.3.1_GH0.tar.gz) = b70b1d8b97b44086b64e467f81c6aceb8263092c26a8cf1a7d717eb1b5360415
+SIZE (vysheng-tg-1.3.1_GH0.tar.gz) = 278051
+SHA256 (vysheng-tl-parser-1659d87_GH0.tar.gz) = 6b9538b0c3be3bb25e4f4750ecbea42ce7be58b005a3eeb372b9d15fbaa92e0b
+SIZE (vysheng-tl-parser-1659d87_GH0.tar.gz) = 78615