diff --git a/math/mpir/Makefile b/math/mpir/Makefile
index f8f8cc04e541..72b885df2ac6 100644
--- a/math/mpir/Makefile
+++ b/math/mpir/Makefile
@@ -1,39 +1,43 @@
 PORTNAME=	mpir
-PORTVERSION=	3.0.0
-PORTREVISION=	1
+DISTVERSIONPREFIX=	${PORTNAME}-
+DISTVERSION=	3.0.0
+PORTREVISION=	2
 CATEGORIES=	math
-MASTER_SITES=	https://mpir.org/
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Multiprecision integer, rational, floating point numbers library
-WWW=		https://www.mpir.org
+WWW=		https://github.com/wbhart/mpir/
 
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
-BUILD_DEPENDS=	yasm:devel/yasm
+BUILD_DEPENDS=	makeinfo:print/texinfo \
+		yasm:devel/yasm
+
+USES=		autoreconf libtool
+USE_GITHUB=	yes
+GH_ACCOUNT=	wbhart
+USE_LDCONFIG=	yes
 
-USES=		libtool tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-cxx --with-system-yasm
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
-USE_LDCONFIG=	yes
 
 MPIR_VERSION=	23.0.3
 MPIRXX_VERSION=	8.4.3
 
 INFO=		mpir
 
 PLIST_FILES=	include/mpir.h \
 		include/mpirxx.h \
 		lib/libmpir.a \
 		lib/libmpir.so \
 		lib/libmpir.so.${MPIR_VERSION} \
 		lib/libmpir.so.${MPIR_VERSION:R:R} \
 		lib/libmpirxx.a \
 		lib/libmpirxx.so \
 		lib/libmpirxx.so.${MPIRXX_VERSION} \
 		lib/libmpirxx.so.${MPIRXX_VERSION:R:R}
 
 .include <bsd.port.mk>
diff --git a/math/mpir/distinfo b/math/mpir/distinfo
index 30ae1a5d20af..2a044ff774c3 100644
--- a/math/mpir/distinfo
+++ b/math/mpir/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497579770
-SHA256 (mpir-3.0.0.tar.bz2) = 52f63459cf3f9478859de29e00357f004050ead70b45913f2c2269d9708675bb
-SIZE (mpir-3.0.0.tar.bz2) = 2572041
+TIMESTAMP = 1777123456
+SHA256 (wbhart-mpir-mpir-3.0.0_GH0.tar.gz) = 86a5039badc3e6738219a262873a1db5513405e15ece9527b718fcd0fac09bb2
+SIZE (wbhart-mpir-mpir-3.0.0_GH0.tar.gz) = 3116506