Index: head/UPDATING
===================================================================
--- head/UPDATING
+++ head/UPDATING
@@ -5,6 +5,23 @@
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20200320:
+  AFFECTS: users of x11/libxkbcommon
+  AUTHOR: zeising@FreeBSD.org
+
+  The libxkbcommon library (x11/libxkbcommon), used to handle keyboards
+  in some applications, most notably kde and wayland, have been switched
+  to use evdev rules by default.  Some keys, most notably arrow keys, 
+  may not work in applications using libxkbcommon, if you use
+  xf86-input-keyboard rather than xf86-input-libinput.
+  If you have trouble with the keyboard keys, and if /var/log/Xorg.*.log
+  shows that the "kbd" or "keyboard" driver is beind used, you need to
+  switch to legacy rules by setting the environment variable
+  XKB_DEFAULT_RULES to xorg.
+  This switch is make to match the default configuration on FreeBSD 12.1 and
+  later, the default configuration on FreeBSD 11.3 still requres the legacy
+  rules.
+
 20200316:
   AFFECTS: users of net-im/slack-term
   AUTHOR: dmgk@FreeBSD.org
Index: head/x11/libxkbcommon/Makefile
===================================================================
--- head/x11/libxkbcommon/Makefile
+++ head/x11/libxkbcommon/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	libxkbcommon
 PORTVERSION=	0.10.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	https://xkbcommon.org/download/
 DIST_SUBDIR=	xorg/lib
@@ -16,8 +17,7 @@
 
 USES=		bison meson pkgconfig tar:xz xorg
 USE_XORG=	xcb
-MESON_ARGS=	-Ddefault-rules=xorg \
-		-Denable-docs=false \
+MESON_ARGS=	-Denable-docs=false \
 		-Denable-wayland=false \
 		-Dx-locale-root="${PREFIX}/lib/X11/locale"
 
Index: head/x11/libxkbcommon/pkg-message
===================================================================
--- head/x11/libxkbcommon/pkg-message
+++ head/x11/libxkbcommon/pkg-message
@@ -0,0 +1,13 @@
+[
+{ type: install
+  message: <<EOM
+If arrow keys don't work under X11 switch to legacy rules e.g.,
+
+For sh/bash/ksh/zsh run and (optionally) add into ~/.profile:
+  export XKB_DEFAULT_RULES=xorg
+
+For csh/tcsh run and (optionally) add into ~/.login:
+  setenv XKB_DEFAULT_RULES xorg
+EOM
+}
+]