diff --git a/math/Makefile b/math/Makefile
index 0a4d874cc722..3aa375cb5464 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -1082,6 +1082,7 @@
     SUBDIR += wxmaxima
     SUBDIR += xblas
     SUBDIR += xfce4-calculator-plugin
+    SUBDIR += xgap
     SUBDIR += xgraph
     SUBDIR += xlapack
     SUBDIR += xldlas
diff --git a/math/xgap/Makefile b/math/xgap/Makefile
new file mode 100644
index 000000000000..a620fff3e136
--- /dev/null
+++ b/math/xgap/Makefile
@@ -0,0 +1,41 @@
+PORTNAME=	xgap
+DISTVERSIONPREFIX=	v
+DISTVERSION=	4.31
+CATEGORIES=	math
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Graphical user interface for GAP
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	gap:math/gap
+LIB_DEPENDS=	libXaw.so:x11-toolkits/libXaw
+RUN_DEPENDS=	gap:math/gap
+
+USES=		autoreconf gmake xorg
+USE_XORG=	ice sm x11 xext xmu xt
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	gap-packages
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-gaproot=${LOCALBASE}/share/gap
+
+ALL_TARGET=	default
+
+PLIST_FILES=	bin/xgap \
+		bin/xgap-bin
+
+pre-build:
+	@cd ${WRKSRC} && ./autogen.sh
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/*/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${REINPLACE_CMD} -i '' -e " \
+		s,^XGAP=.*,XGAP=${PREFIX}/bin/${PORTNAME}-bin,; \
+		s,^GAP=.*,GAP=${PREFIX}/bin/gap,; \
+		" ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+
+.include <bsd.port.mk>
diff --git a/math/xgap/distinfo b/math/xgap/distinfo
new file mode 100644
index 000000000000..4e71222154de
--- /dev/null
+++ b/math/xgap/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1645117274
+SHA256 (gap-packages-xgap-v4.31_GH0.tar.gz) = e45073adb568fd632f6b78cbb6ebc9c644bab11be3d787de33ac99ca624c7e7c
+SIZE (gap-packages-xgap-v4.31_GH0.tar.gz) = 256467
diff --git a/math/xgap/pkg-descr b/math/xgap/pkg-descr
new file mode 100644
index 000000000000..60c6e577c139
--- /dev/null
+++ b/math/xgap/pkg-descr
@@ -0,0 +1,3 @@
+The XGAP package allows to use graphics in GAP.
+
+WWW: https://gap-packages.github.io/xgap/