diff --git a/graphics/Makefile b/graphics/Makefile
index e78a1fb7c1ae..e537a58e2c49 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -261,6 +261,7 @@
     SUBDIR += glosm
     SUBDIR += glpng
     SUBDIR += gltt
+    SUBDIR += glx-utils
     SUBDIR += gmic
     SUBDIR += gmic-qt
     SUBDIR += gmt
diff --git a/graphics/glx-utils/Makefile b/graphics/glx-utils/Makefile
new file mode 100644
index 000000000000..f2a4a4514071
--- /dev/null
+++ b/graphics/glx-utils/Makefile
@@ -0,0 +1,36 @@
+# $FreeBSD$
+
+PORTNAME=	glx-utils
+DISTVERSIONPREFIX=	${GL_ACCOUNT}-${GL_PROJECT}-
+DISTVERSION=	8.4.0-43
+CATEGORIES=	graphics
+
+MAINTAINER=	jbeich@FreeBSD.org
+COMMENT=	List GLX capabilities and simple renderer
+
+LICENSE=	MIT
+
+CONFLICTS_INSTALL=	mesa-demos
+
+USES=		gl localbase:ldflags xorg
+USE_GITLAB=	yes
+USE_GL=		gl
+USE_XORG=	x11
+GL_SITE=	https://gitlab.freedesktop.org
+GL_ACCOUNT=	mesa
+GL_PROJECT=	demos
+GL_COMMIT=	0de7436be906b720f503668609404c97ea3a124b
+WRKSRC_SUBDIR=	src/xdemos
+PLIST_FILES=	bin/glxgears \
+		bin/glxinfo \
+		${NULL}
+
+do-build:
+	(cd ${WRKSRC} && ${CC} ${CFLAGS} -o glxinfo glxinfo.c glinfo_common.c ${LDFLAGS} -lGL -lX11)
+	(cd ${WRKSRC} && ${CC} ${CFLAGS} -o glxgears glxgears.c ${LDFLAGS} -lGL -lX11 -lm)
+
+do-install:
+	${INSTALL_PROGRAM} ${PLIST_FILES:Mbin/*:S,^bin,${WRKSRC},} \
+		${STAGEDIR}${PREFIX}/bin
+
+.include <bsd.port.mk>
diff --git a/graphics/glx-utils/distinfo b/graphics/glx-utils/distinfo
new file mode 100644
index 000000000000..1fa48900c38c
--- /dev/null
+++ b/graphics/glx-utils/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1596536383
+SHA256 (mesa-demos-0de7436be906b720f503668609404c97ea3a124b_GL0.tar.gz) = 6f2889b07d8437810e8f734733c117c4e0f25c492a91b72a3bc6b9b620a7cbd9
+SIZE (mesa-demos-0de7436be906b720f503668609404c97ea3a124b_GL0.tar.gz) = 20749697
diff --git a/graphics/glx-utils/pkg-descr b/graphics/glx-utils/pkg-descr
new file mode 100644
index 000000000000..f058df7b3d0f
--- /dev/null
+++ b/graphics/glx-utils/pkg-descr
@@ -0,0 +1,6 @@
+A few popular OpenGL X11 demos from Mesa:
+
+- glxinfo prints capabilities of OpenGL driver
+- glxgears draws rotating gears and prints FPS
+
+WWW: https://www.mesa3d.org/
diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile
index 48c222434a45..838c9923b445 100644
--- a/graphics/mesa-demos/Makefile
+++ b/graphics/mesa-demos/Makefile
@@ -14,6 +14,8 @@ LICENSE=	MIT
 
 LIB_DEPENDS=	libdrm.so:graphics/libdrm
 
+CONFLICTS_INSTALL=	glx-utils
+
 USES=		gmake gl localbase pkgconfig tar:bzip2 xorg
 GNU_CONFIGURE=	yes
 USE_GL=		egl gbm gl glesv2 glew glu glut