diff --git a/wayland/xkeyboard-config/checksums b/wayland/xkeyboard-config/checksums
index 5f611812..47fdcef8 100644
--- a/wayland/xkeyboard-config/checksums
+++ b/wayland/xkeyboard-config/checksums
@@ -1,4 +1,4 @@
 1f1bb1292a161d520a3485d378609277d108cd07cde0327c16811ff54c3e1595
-081bf42ebab023aa92cfdb20c7af8c5ae13d13e88a5e22f90f4453ef80bbdde4
+1bc41aa1bbe01401f330d76dfa19f386b79c51881c7bbfee9eb4e27f22f2d9f7
 355999ad6dc3fae3e8fbc939a803faaed91f45d778326395dee9780836140c4a
-e1ecd235757fe2afdd06c7cb2f94461fac8db3544ba8248275d18b06a3b2d51d
+f7077729590892a26d4160f05f8012055b03abdfc9a522e67bea360f12def624
diff --git a/wayland/xkeyboard-config/patches/compose-only.patch b/wayland/xkeyboard-config/patches/compose-only.patch
index 2a633297..7f1c65ff 100644
--- a/wayland/xkeyboard-config/patches/compose-only.patch
+++ b/wayland/xkeyboard-config/patches/compose-only.patch
@@ -1,21 +1,22 @@
 diff --git a/configure b/configure
-index aa8de21..916c65c 100755
+index 68fb781..dccee41 100755
 --- a/configure
 +++ b/configure
-@@ -21015,36 +21015,6 @@ $as_echo "#define USE_POLL 1" >>confdefs.h
+@@ -22250,37 +22250,6 @@ printf "%s\n" "#define USE_POLL 1" >>confdefs.h
  fi
  
  
 -#
 -# Find keysymdef.h
 -#
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking keysym definitions" >&5
--$as_echo_n "checking keysym definitions... " >&6; }
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking keysym definitions" >&5
+-printf %s "checking keysym definitions... " >&6; }
 -
 -# Check whether --with-keysymdefdir was given.
--if test "${with_keysymdefdir+set}" = set; then :
+-if test ${with_keysymdefdir+y}
+-then :
 -  withval=$with_keysymdefdir; KEYSYMDEFDIR=$withval
--else
+-else $as_nop
 -  KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
 -fi
 -
@@ -32,28 +33,28 @@ index aa8de21..916c65c 100755
 -	    as_fn_error $? "Cannot find keysymdef.h" "$LINENO" 5
 -    fi
 -done
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $KEYSYMDEFS" >&5
--$as_echo "$KEYSYMDEFS" >&6; }
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $KEYSYMDEFS" >&5
+-printf "%s\n" "$KEYSYMDEFS" >&6; }
 -
 -
  # Check whether --enable-xcms was given.
- if test "${enable_xcms+set}" = set; then :
-   enableval=$enable_xcms; XCMS=$enableval
-@@ -21615,43 +21585,6 @@ _ACEOF
+ if test ${enable_xcms+y}
+ then :
+@@ -22848,43 +22817,6 @@ printf "%s\n" "#define X11_LIBDIR \"$ax_define_dir\"" >>confdefs.h
  
  
  pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5
--$as_echo_n "checking for X11... " >&6; }
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X11" >&5
+-printf %s "checking for X11... " >&6; }
 -
 -if test -n "$X11_CFLAGS"; then
 -    pkg_cv_X11_CFLAGS="$X11_CFLAGS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$X11_REQUIRES\""; } >&5
+-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$X11_REQUIRES\""; } >&5
 -  ($PKG_CONFIG --exists --print-errors "$X11_REQUIRES") 2>&5
 -  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 -  test $ac_status = 0; }; then
 -  pkg_cv_X11_CFLAGS=`$PKG_CONFIG --cflags "$X11_REQUIRES" 2>/dev/null`
 -		      test "x$?" != "x0" && pkg_failed=yes
@@ -67,10 +68,10 @@ index aa8de21..916c65c 100755
 -    pkg_cv_X11_LIBS="$X11_LIBS"
 - elif test -n "$PKG_CONFIG"; then
 -    if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$X11_REQUIRES\""; } >&5
+-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$X11_REQUIRES\""; } >&5
 -  ($PKG_CONFIG --exists --print-errors "$X11_REQUIRES") 2>&5
 -  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 -  test $ac_status = 0; }; then
 -  pkg_cv_X11_LIBS=`$PKG_CONFIG --libs "$X11_REQUIRES" 2>/dev/null`
 -		      test "x$?" != "x0" && pkg_failed=yes
diff --git a/wayland/xkeyboard-config/sources b/wayland/xkeyboard-config/sources
index f4a3474f..343b822e 100644
--- a/wayland/xkeyboard-config/sources
+++ b/wayland/xkeyboard-config/sources
@@ -1,4 +1,4 @@
 https://x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-VERSION.tar.xz
-https://x.org/releases/individual/lib/libX11-1.8.tar.xz libX11
+https://x.org/releases/individual/lib/libX11-1.8.1.tar.xz libX11
 files/xml2lst rules
 patches/compose-only.patch
diff --git a/wayland/xkeyboard-config/version b/wayland/xkeyboard-config/version
index 54a6bc87..30e48fe4 100644
--- a/wayland/xkeyboard-config/version
+++ b/wayland/xkeyboard-config/version
@@ -1 +1 @@
-2.36 1
+2.36 2