diff --git a/dont-forward-keycode-0.patch b/dont-forward-keycode-0.patch
index 89fa78dde897a2db88a5f01f660b8b42e751beeb..b71ffe012ecb0d2b9b431fc059f3c850b043969f 100644
--- a/dont-forward-keycode-0.patch
+++ b/dont-forward-keycode-0.patch
@@ -1,31 +1,19 @@
-From f8b0946c5594728ce7e1cd04552acce05571cd4e Mon Sep 17 00:00:00 2001
-From: leeffo <leeffo@yeah.net>
-Date: Wed, 12 Apr 2023 10:40:48 +0800
-Subject: [PATCH] dont forward keycode 0
-
----
- modules/im/ximcp/imDefFlt.c  |  2 +-
- modules/im/ximcp/imDefLkup.c | 24 ++++++++++++++++++++++++
- 2 files changed, 25 insertions(+), 1 deletion(-)
-
-diff --git a/modules/im/ximcp/imDefFlt.c b/modules/im/ximcp/imDefFlt.c
-index 44cc688..f89d2cb 100644
---- a/modules/im/ximcp/imDefFlt.c
-+++ b/modules/im/ximcp/imDefFlt.c
-@@ -142,7 +142,7 @@ _XimProtoKeypressFilter(
+diff -up libX11-1.8.10/modules/im/ximcp/imDefFlt.c.jx libX11-1.8.10/modules/im/ximcp/imDefFlt.c
+--- libX11-1.8.10/modules/im/ximcp/imDefFlt.c.jx	2024-08-04 19:08:38.884682300 +0800
++++ libX11-1.8.10/modules/im/ximcp/imDefFlt.c	2024-08-04 19:09:16.340626000 +0800
+@@ -143,7 +143,7 @@
  {
      Xim		im = (Xim)ic->core.im;
  
--    if (IS_FABRICATED(im)) {
-+    if ((ev->keycode == 0) || IS_FABRICATED(im)) {
+-    if (_XimIsFabricatedSerial(im, ev)) {
++    if ((ev->keycode == 0) || _XimIsFabricatedSerial(im, ev)) {
  	_XimPendingFilter(ic);
- 	UNMARK_FABRICATED(im);
+ 	_XimUnfabricateSerial(im, ic, ev);
  	return NOTFILTERD;
-diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c
-index dd1adf5..61f9c95 100644
---- a/modules/im/ximcp/imDefLkup.c
-+++ b/modules/im/ximcp/imDefLkup.c
-@@ -333,6 +333,17 @@ _XimForwardEvent(
+diff -up libX11-1.8.10/modules/im/ximcp/imDefLkup.c.jx libX11-1.8.10/modules/im/ximcp/imDefLkup.c
+--- libX11-1.8.10/modules/im/ximcp/imDefLkup.c.jx	2024-08-04 19:09:16.340626000 +0800
++++ libX11-1.8.10/modules/im/ximcp/imDefLkup.c	2024-08-04 19:09:16.340626000 +0800
+@@ -333,6 +333,17 @@
      XEvent	*ev,
      Bool	 sync)
  {
@@ -43,9 +31,9 @@ index dd1adf5..61f9c95 100644
  #ifdef EXT_FORWARD
      if (((ev->type == KeyPress) || (ev->type == KeyRelease)))
  	if (_XimExtForwardKeyEvent(ic, (XKeyEvent *)ev, sync))
-@@ -605,6 +616,19 @@ _XimUnregCommitInfo(
-     Xfree(info->keysym);
-     ic->private.proto.commit_info = info->next;
+@@ -703,6 +714,19 @@
+     else
+ 	ic->private.proto.commit_info = info->next;
      Xfree(info);
 +
 +    /*
@@ -63,6 +51,3 @@ index dd1adf5..61f9c95 100644
      return;
  }
  
--- 
-2.20.1
-
diff --git a/libX11-1.8.10.tar.xz b/libX11-1.8.10.tar.xz
new file mode 100644
index 0000000000000000000000000000000000000000..e3c0afd5dfa024d178c992d28f8b54c53304b00d
Binary files /dev/null and b/libX11-1.8.10.tar.xz differ
diff --git a/libX11-1.8.7.tar.xz b/libX11-1.8.7.tar.xz
deleted file mode 100644
index ed7cbc877f5aa99fe42954bc0832ade140be59bb..0000000000000000000000000000000000000000
Binary files a/libX11-1.8.7.tar.xz and /dev/null differ
diff --git a/libX11.spec b/libX11.spec
index 9cf211ccb978a13933e424526b4c9dd0756299b1..46566b875d9909ff15f7cbe39ed4d73fefb0e093 100644
--- a/libX11.spec
+++ b/libX11.spec
@@ -1,16 +1,24 @@
 Name:		libX11
-Version:	1.8.7
-Release:	2
+Version:	1.8.10
+Release:	1
 Summary:	Core X11 protocol client library
-License:	MIT
-URL:		http://www.x.org
-Source0:	https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.xz
-
-Patch1:         dont-forward-keycode-0.patch
-Patch2:		libX11-1.7.2-sw_64.patch
-
-BuildRequires:	xorg-x11-util-macros >= 1.11 xorg-x11-proto-devel perl-Pod-Usage libXau-devel
-BuildRequires:  libxcb-devel >= 1.2 libXdmcp-devel xorg-x11-xtrans-devel >= 1.0.3-4 make
+License:	MIT and X11
+URL:		https://www.x.org
+Source0:	https://www.x.org/releases/individual/lib/%{name}-%{version}.tar.xz
+
+Patch1: 	dont-forward-keycode-0.patch
+Patch2: 	libX11-1.7.2-sw_64.patch
+
+BuildRequires: pkgconfig(inputproto)
+BuildRequires: pkgconfig(kbproto)
+BuildRequires: pkgconfig(xcb) >= 1.11.1
+BuildRequires: pkgconfig(xextproto)
+BuildRequires: pkgconfig(xf86bigfontproto) >= 1.2.0
+BuildRequires: pkgconfig(xorg-macros) >= 1.15
+BuildRequires: pkgconfig(xproto) >= 7.0.25
+BuildRequires: pkgconfig(xtrans)
+BuildRequires: xmlto >= 0.0.22
+BuildRequires: make
 
 Provides:       %{name}-common = %{version}-%{release}
 Obsoletes:      %{name}-common < %{version}-%{release}
@@ -48,24 +56,26 @@ autoreconf -ivf
 mkdir -p $RPM_BUILD_ROOT/var/cache/libX11/compose
 %delete_la
 
-%check
-make %{?_smp_mflags} check
+# Don't install Xcms.txt - find out why upstream still ships this.
+find $RPM_BUILD_ROOT -name 'Xcms.txt' -delete
 
-%ldconfig_scriptlets
+# package these properly
+rm -rf $RPM_BUILD_ROOT%{_docdir}
+
+%check
+%make_build check
 
 %files
-%defattr(-,root,root)
 %doc AUTHORS
 %license COPYING
 %{_libdir}/*.so.*
 %{_datadir}/X11/locale/*
+
 %{_datadir}/X11/XErrorDB
+%dir /var/cache/libX11
 %dir /var/cache/libX11/compose
-%exclude %{_docdir}/*
-%exclude %{_datadir}/X11/Xcms.txt
 
 %files          devel
-%defattr(-,root,root)
 %{_libdir}/*.a
 %{_libdir}/*.so
 %{_includedir}/X11/*.h
@@ -73,11 +83,13 @@ make %{?_smp_mflags} check
 %{_includedir}/X11/extensions/XKBgeom.h
 
 %files          help
-%defattr(-,root,root)
 %doc README.md ChangeLog
 %{_mandir}/*/*
 
 %changelog
+* Sun Aug 04 2024 Funda Wang <fundawang@yeah.net> - 1.8.10-1
+- update to 1.8.10
+
 * Mon Feb 05 2024 zhouwenpei <zhouwenpei1@h-partners.com> - 1.8.7-2
 - revent "disable static library"