diff --git a/sysutils/keyd/Makefile b/sysutils/keyd/Makefile
index bbbcd170530d..c628549192e3 100644
--- a/sysutils/keyd/Makefile
+++ b/sysutils/keyd/Makefile
@@ -1,54 +1,56 @@
 PORTNAME=	keyd
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.4.0
+DISTVERSION=	2.4.1
 CATEGORIES=	sysutils
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Key remapping daemon for evdev
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
 LIB_DEPENDS=	libinotify.so:devel/libinotify
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		gmake python:env shebangfix
 USE_GITHUB=	yes
 USE_RC_SUBR=	${PORTNAME}
 GH_ACCOUNT=	rvaiya
 SHEBANG_FILES=	scripts/*
 MAKE_ARGS=	DESTDIR="${DESTDIR}" PREFIX="${PREFIX}" \
 		GIT_HASH="${DISTVERSIONFULL}"
 PLIST_FILES=	bin/${PORTNAME} \
 		bin/${PORTNAME}-application-mapper \
-		${ETCDIR}/${PORTNAME}.compose
+		${DATADIR}/keyd.compose \
+		"@dir ${ETCDIR}"
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES MANPAGES
 OPTIONS_DEFAULT=MANPAGES
 
 MANPAGES_BUILD_DEPENDS=	scdoc:textproc/scdoc
 MANPAGES_ALL_TARGET=	all man
 MANPAGES_PLIST_FILES=	share/man/man1/${PORTNAME}.1.gz \
 			share/man/man1/${PORTNAME}-application-mapper.1.gz \
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/etc,$$(PREFIX)&,' \
 		-e 's,/usr/local,${LOCALBASE},' \
 		-e 's,${DOCSDIR_REL}/examples,${EXAMPLESDIR_REL},' \
+		-e '/_XOPEN_SOURCE/d' \
 		-e 's/ -O3//' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's,/usr,${PREFIX}&,' \
 		-e 's,/etc,${PREFIX}&,' \
 		${WRKSRC}/docs/*.scdoc \
 		${WRKSRC}/examples/*.conf \
 		${WRKSRC}/src/${PORTNAME}.c
 # https://lists.freebsd.org/pipermail/freebsd-x11/2019-March/023097.html
 	@${REINPLACE_CMD} -e 's,__FreeBSD,&_disabled,' \
 		${WRKSRC}/src/vkbd/uinput.c
 
 .include <bsd.port.mk>
diff --git a/sysutils/keyd/distinfo b/sysutils/keyd/distinfo
index eeb188bc1ef3..65852db36a0e 100644
--- a/sysutils/keyd/distinfo
+++ b/sysutils/keyd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1650418909
-SHA256 (rvaiya-keyd-v2.4.0_GH0.tar.gz) = 100007894ac4fa6e95f5de5c2fe992c8b00e68d9df76c4bcdd8402a29d7b4058
-SIZE (rvaiya-keyd-v2.4.0_GH0.tar.gz) = 625319
+TIMESTAMP = 1655534821
+SHA256 (rvaiya-keyd-v2.4.1_GH0.tar.gz) = 23e6eac529b0c07ad99420c2a8a75967b7cadb0c3509284cc0f7633056dc50e2
+SIZE (rvaiya-keyd-v2.4.1_GH0.tar.gz) = 628300