diff --git a/x11/gromit-mpx/Makefile b/x11/gromit-mpx/Makefile
index d7b706493cfc..925440527d3b 100644
--- a/x11/gromit-mpx/Makefile
+++ b/x11/gromit-mpx/Makefile
@@ -1,28 +1,37 @@
 PORTNAME=	gromit-mpx
 DISTVERSION=	1.4.3
 PORTREVISION=	1
 CATEGORIES=	x11 wayland
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	698a43a8dcd7.patch:-p1 # https://github.com/bk138/gromit-mpx/pull/177
+PATCHFILES+=	7cd913191b48.patch:-p1 # https://github.com/bk138/gromit-mpx/pull/177
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Desktop annotation tool, multi-pointer port of Gromit
 WWW=		https://github.com/bk138/gromit-mpx
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libappindicator3.so:devel/libappindicator
 
-USES=		cmake gnome pkgconfig xorg
+USES=		cmake gnome pkgconfig
 USE_CSTD=	gnu99
 USE_GITHUB=	yes
 USE_GNOME=	cairo gdkpixbuf2 gtk30
-USE_XORG=	x11 xi
 GH_ACCOUNT=	bk138
 LDFLAGS+=	-Wl,--as-needed # atk, dbusmenu, pango
 
+OPTIONS_DEFINE=	X11
+OPTIONS_DEFAULT=X11
+
+X11_USES=	xorg
+X11_USE=	XORG=x11 xi
+
 post-patch:
 # Let @sample handle default files under etc/
 	@${REINPLACE_CMD} -e '/data.*cfg/s/)/ RENAME ${PORTNAME}.cfg.sample)/' \
 		${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/x11/gromit-mpx/distinfo b/x11/gromit-mpx/distinfo
index 9260264e1a65..1c530714dae4 100644
--- a/x11/gromit-mpx/distinfo
+++ b/x11/gromit-mpx/distinfo
@@ -1,3 +1,7 @@
 TIMESTAMP = 1664109823
 SHA256 (bk138-gromit-mpx-1.4.3_GH0.tar.gz) = 01c3e37ea0977a507349df34c474bdc939a57287aa41ce96d9eeb4d21279c6a4
 SIZE (bk138-gromit-mpx-1.4.3_GH0.tar.gz) = 1861824
+SHA256 (698a43a8dcd7.patch) = ad3943e4b288939b8e1637f60c2325a89b0fe8acb3e378ac6c61fdf42ec51be5
+SIZE (698a43a8dcd7.patch) = 7528
+SHA256 (7cd913191b48.patch) = f5f9911f59201d3fcc1aff40e1e802ebd824c2b5328597c71a5c9de70f66c6d4
+SIZE (7cd913191b48.patch) = 922