diff --git a/sysutils/keyd/Makefile b/sysutils/keyd/Makefile
index 6cd6b262ad7c..1c3aec41664b 100644
--- a/sysutils/keyd/Makefile
+++ b/sysutils/keyd/Makefile
@@ -1,37 +1,40 @@
 PORTNAME=	keyd
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.1.2
+DISTVERSION=	1.3.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Key remapping daemon for evdev
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
 LIB_DEPENDS=	libudev.so:devel/libudev-devd
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		localbase:ldflags
 USE_GITHUB=	yes
 USE_RC_SUBR=	${PORTNAME}
 GH_ACCOUNT=	rvaiya
 MAKE_ARGS=	DESTDIR="${DESTDIR}" PREFIX="${PREFIX}" \
 		GIT_HASH="${DISTVERSIONFULL}"
 PLIST_FILES=	bin/${PORTNAME} \
 		share/man/man1/${PORTNAME}.1.gz \
 		"@dir ${ETCDIR}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \
+		-e 's,/var/lock,/var/run,' \
+		-e 's,/usr/local,${LOCALBASE},' \
 		-e '/systemd/d' \
 		-e '/^CFLAGS/s/=/+=/' \
 		-e '/-l/s/$$/ $$(LDFLAGS)/' \
 		-e 's/ -O3//' \
 		${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \
-		${WRKSRC}/src/config.h
-	@${REINPLACE_CMD} -e 's,/var/lock,/var/run,' \
-		${WRKSRC}/src/main.c
+# https://lists.freebsd.org/pipermail/freebsd-x11/2019-March/023097.html
+	@${REINPLACE_CMD} -e 's,__FreeBSD,&_disabled,' \
+		${WRKSRC}/src/config.h \
+		${WRKSRC}/src/keys.h \
+		${WRKSRC}/src/main.c \
+		${NULL}
 
 .include <bsd.port.mk>
diff --git a/sysutils/keyd/distinfo b/sysutils/keyd/distinfo
index 0ec962d38769..4bb954607d58 100644
--- a/sysutils/keyd/distinfo
+++ b/sysutils/keyd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629758190
-SHA256 (rvaiya-keyd-v1.1.2_GH0.tar.gz) = e82309f10dbe29b9e927be712efb33a8bd99292f37715a5c5bff5860ad1b9e78
-SIZE (rvaiya-keyd-v1.1.2_GH0.tar.gz) = 26547
+TIMESTAMP = 1637913336
+SHA256 (rvaiya-keyd-v1.3.0_GH0.tar.gz) = 9b2195e69f407f08b9aa377d0bca2cd877c5aa9d67a606b81194941ff4ee8b11
+SIZE (rvaiya-keyd-v1.3.0_GH0.tar.gz) = 30789