diff --git a/www/mathjax/Makefile b/www/mathjax/Makefile
index e603ecd01fd0..e74b57a77b80 100644
--- a/www/mathjax/Makefile
+++ b/www/mathjax/Makefile
@@ -2,32 +2,30 @@
 # $FreeBSD$
 
 PORTNAME=	MathJax
-PORTVERSION=	2.0
-#PORTREVISION=	0
+PORTVERSION=	2.2
 CATEGORIES=	www
-MASTER_SITES=	https://nodeload.github.com/mathjax/MathJax/tarball/v${PORTVERSION}-latest?dummy=/
 
 MAINTAINER=	lukasz.stelmach@iem.pw.edu.pl
-COMMENT=	A cross-browser JavaScript display engine for mathematics
+COMMENT=	Cross-browser JavaScript display engine for mathematics
 
-FETCH_BEFORE_ARGS=	-o ${DISTNAME}${EXTRACT_SUFX}
+NO_BUILD=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	mathjax
+GH_TAGNAME=	v${PORTVERSION}
 
-NO_BUILD=	 yes
-
-WRKSRC=	${WRKDIR}/mathjax-MathJax-07669ac
+WRKSRC=	${WRKDIR}/${GH_ACCOUNT}-${PORTNAME}-54280bb
 
 # Changing permissions of 30k files with find -exec (COPYTREE) is way
 # too slow.
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${WWWDIR}
+	${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && \
-		${FIND} -d . | ${CPIO} -dumpl ${WWWDIR} >/dev/null 2>&1)
-	${FIND} -d ${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
-	${FIND} -d ${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} ${SHAREMODE}
-	${CHOWN} -R ${BINOWN}:${BINGRP} ${WWWDIR}
-	@(cd ${PREFIX}; ${FIND} -s ${WWWDIR_REL} -not -type d) >> ${TMPPLIST}
-	@(cd ${PREFIX}; ${FIND} -s -d ${WWWDIR_REL} -type d) \
+		${FIND} -d . | ${CPIO} -dumpl ${STAGEDIR}${WWWDIR} >/dev/null 2>&1)
+	${FIND} -d ${STAGEDIR}${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
+	${FIND} -d ${STAGEDIR}${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} ${SHAREMODE}
+	${CHOWN} -R ${BINOWN}:${BINGRP} ${STAGEDIR}${WWWDIR}
+	@(cd ${STAGEDIR}${PREFIX}; ${FIND} -s ${WWWDIR_REL} -not -type d) >> ${TMPPLIST}
+	@(cd ${STAGEDIR}${PREFIX}; ${FIND} -s -d ${WWWDIR_REL} -type d) \
 	| ${SED} -ne 's,^,@dirrm ,p' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/www/mathjax/distinfo b/www/mathjax/distinfo
index 172239a3d1f4..de160e7dfa0b 100644
--- a/www/mathjax/distinfo
+++ b/www/mathjax/distinfo
@@ -1,2 +1,2 @@
-SHA256 (MathJax-2.0.tar.gz) = 01ad97362b9bac25420cbffd9d733d9abd3a750ba82b68063d4b2608c43a70ae
-SIZE (MathJax-2.0.tar.gz) = 9457775
+SHA256 (MathJax-2.2.tar.gz) = 3c01dc8c3fd6869311d45c15c348f7ad682aefa3ae03ccf201f9cad83e26ceb1
+SIZE (MathJax-2.2.tar.gz) = 8972964