diff --git a/graphics/libepoxy/Makefile b/graphics/libepoxy/Makefile
index 83446baeaf4a..835e7111c023 100644
--- a/graphics/libepoxy/Makefile
+++ b/graphics/libepoxy/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	libepoxy
-PORTVERSION=	1.5.7
+DISTVERSION=	1.5.8
 CATEGORIES=	graphics
+MASTER_SITES=	https://github.com/anholt/${PORTNAME}/releases/download/${DISTVERSION}/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Library to handle OpenGL function pointer management
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gl localbase meson pkgconfig python:3.6+,build shebangfix
-USE_GITHUB=	yes
-GH_ACCOUNT=	anholt
+USES=		gl localbase meson pkgconfig python:3.6+,build shebangfix tar:xz
 USE_GL=		glesv2 egl
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	src/gen_dispatch.py
 
-OPTIONS_DEFINE=		X11
+OPTIONS_DEFINE=		TEST X11
 OPTIONS_DEFAULT=	X11
 OPTIONS_SUB=		yes
 
+TEST_MESON_TRUE=	tests
+
 X11_USES=		xorg
 X11_USE=		GL=gl XORG=x11
 X11_MESON_YES=		glx
 X11_MESON_TRUE=		x11
 
 .include <bsd.port.mk>
diff --git a/graphics/libepoxy/distinfo b/graphics/libepoxy/distinfo
index 755c3b01025c..2a714e48832b 100644
--- a/graphics/libepoxy/distinfo
+++ b/graphics/libepoxy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619783801
-SHA256 (anholt-libepoxy-1.5.7_GH0.tar.gz) = b9e22ba707d0e723e9665c67a2b2974a86f4c4c27e3009dde24a988d1aadf643
-SIZE (anholt-libepoxy-1.5.7_GH0.tar.gz) = 331868
+TIMESTAMP = 1621666992
+SHA256 (libepoxy-1.5.8.tar.xz) = cf05e4901778c434aef68bb7dc01bea2bce15440c0cecb777fb446f04db6fe0d
+SIZE (libepoxy-1.5.8.tar.xz) = 221824