diff --git a/x11/Makefile b/x11/Makefile
index c053678a07c4..0b3d68feb7e9 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -564,6 +564,7 @@
     SUBDIR += xkbctrl
     SUBDIR += xkbevd
     SUBDIR += xkbind
+    SUBDIR += xkblayout-state
     SUBDIR += xkbprint
     SUBDIR += xkbset
     SUBDIR += xkbutils
diff --git a/x11/xkblayout-state/Makefile b/x11/xkblayout-state/Makefile
new file mode 100644
index 000000000000..0b3da5d0308c
--- /dev/null
+++ b/x11/xkblayout-state/Makefile
@@ -0,0 +1,24 @@
+PORTNAME=	xkblayout-state
+PORTVERSION=	g20211106
+CATEGORIES=	x11
+
+MAINTAINER=	timp87@gmail.com
+COMMENT=	Small program to get/set the current XKB layout
+WWW=		https://github.com/nonpop/xkblayout-state
+
+LICENSE=	GPLv2+
+
+USES=		gmake localbase:ldflags xorg
+USE_XORG=	x11
+USE_GITHUB=	yes
+GH_ACCOUNT=	nonpop
+GH_TAGNAME=	f311779
+
+PORTSCOUT=	skipv:v1,v1b
+
+PLIST_FILES=	bin/${PORTNAME}
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+
+.include <bsd.port.mk>
diff --git a/x11/xkblayout-state/distinfo b/x11/xkblayout-state/distinfo
new file mode 100644
index 000000000000..af815e5b008a
--- /dev/null
+++ b/x11/xkblayout-state/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1636204141
+SHA256 (nonpop-xkblayout-state-g20211106-f311779_GH0.tar.gz) = 2bd4f9cda087a797df20ee41d903d5a447ce1beccf38cef004cf4bfe9d9d134e
+SIZE (nonpop-xkblayout-state-g20211106-f311779_GH0.tar.gz) = 7617
diff --git a/x11/xkblayout-state/pkg-descr b/x11/xkblayout-state/pkg-descr
new file mode 100644
index 000000000000..d894d8cf36aa
--- /dev/null
+++ b/x11/xkblayout-state/pkg-descr
@@ -0,0 +1,5 @@
+xkblayout-state is a small command-line program to get/set the current
+XKB keyboard layout.
+
+It is a thin wrapper around a slightly modified version of Jay Bromley's
+XKeyboard class.