diff --git a/backport-CVE-2023-0494.patch b/backport-CVE-2023-0494.patch
new file mode 100644
index 0000000000000000000000000000000000000000..3e13180f7c49d6006eb8866c5ee3ec11ca53255f
--- /dev/null
+++ b/backport-CVE-2023-0494.patch
@@ -0,0 +1,28 @@
+From 4005f77c03f67f1527519969b047c599cba32e36 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Fri, 17 Feb 2023 16:34:39 +0800
+Subject: [PATCH] fix CVE-2023-0494
+
+---
+ Xi/exevents.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Xi/exevents.c b/Xi/exevents.c
+index 659816a..0cb8d78 100644
+--- a/Xi/exevents.c
++++ b/Xi/exevents.c
+@@ -575,8 +575,10 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to)
+             memcpy(to->button->xkb_acts, from->button->xkb_acts,
+                    sizeof(XkbAction));
+         }
+-        else
++        else {
+             free(to->button->xkb_acts);
++            to->button->xkb_acts = NULL;
++        }
+ 
+         memcpy(to->button->labels, from->button->labels,
+                from->button->numButtons * sizeof(Atom));
+-- 
+2.20.1
+
diff --git a/backport-CVE-2023-1393.patch b/backport-CVE-2023-1393.patch
new file mode 100644
index 0000000000000000000000000000000000000000..520108adcf50f05643af7d4c503623365106cbab
--- /dev/null
+++ b/backport-CVE-2023-1393.patch
@@ -0,0 +1,42 @@
+From 26ef545b3502f61ca722a7a3373507e88ef64110 Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <ofourdan@redhat.com>
+Date: Mon, 13 Mar 2023 11:08:47 +0100
+Subject: [PATCH xserver] composite: Fix use-after-free of the COW
+ 
+ZDI-CAN-19866/CVE-2023-1393
+ 
+If a client explicitly destroys the compositor overlay window (aka COW),
+we would leave a dangling pointer to that window in the CompScreen
+structure, which will trigger a use-after-free later.
+ 
+Make sure to clear the CompScreen pointer to the COW when the latter gets
+destroyed explicitly by the client.
+ 
+This vulnerability was discovered by:
+Jan-Niklas Sohn working with Trend Micro Zero Day Initiative
+ 
+Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+Reviewed-by: Adam Jackson <ajax@redhat.com>
+---
+ composite/compwindow.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+ 
+diff --git a/composite/compwindow.c b/composite/compwindow.c
+index 4e2494b86..b30da589e 100644
+--- a/composite/compwindow.c
++++ b/composite/compwindow.c
+@@ -620,6 +620,11 @@ compDestroyWindow(WindowPtr pWin)
+     ret = (*pScreen->DestroyWindow) (pWin);
+     cs->DestroyWindow = pScreen->DestroyWindow;
+     pScreen->DestroyWindow = compDestroyWindow;
++
++    /* Did we just destroy the overlay window? */
++    if (pWin == cs->pOverlayWin)
++        cs->pOverlayWin = NULL;
++
+ /*    compCheckTree (pWin->drawable.pScreen); can't check -- tree isn't good*/
+     return ret;
+ }
+-- 
+2.40.0
+ 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index d20334eab505ffccaabf5d6a31009d74d8f40286..b4dd754c900ae7ab7c8eb9096ed00e3a2092d733 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -16,7 +16,7 @@
 
 Name:           xorg-x11-server
 Version:        1.20.11
-Release:        15
+Release:        18
 Summary:        X.Org X11 X server
 License:        MIT and GPLv2
 URL:            https://www.x.org
@@ -102,6 +102,8 @@ Patch6015: backport-CVE-2022-46343.patch
 Patch6016: backport-Xi-return-an-error-from-XI-property-changes-if-verification-failed.patch
 Patch6017: backport-CVE-2022-46344.patch
 Patch6018: backport-CVE-2022-4283.patch
+Patch6019: backport-CVE-2023-0494.patch
+Patch6020: backport-CVE-2023-1393.patch
 
 BuildRequires:  audit-libs-devel autoconf automake bison dbus-devel flex git gcc 
 BuildRequires:  systemtap-sdt-devel libtool pkgconfig 
@@ -404,7 +406,6 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
  
 %files Xnest
 %{_bindir}/Xnest
-%{_mandir}/man1/Xnest.1*
  
 %files Xdmx
 %{_bindir}/Xdmx
@@ -423,11 +424,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
 %files Xvfb
 %{_bindir}/Xvfb
 %{_bindir}/xvfb-run
-%{_mandir}/man1/Xvfb.1*
  
 %files Xephyr
 %{_bindir}/Xephyr
-%{_mandir}/man1/Xephyr.1*
  
 %files source
 %{xserver_source_dir}
@@ -445,6 +444,15 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
 %{_mandir}/man*/*
 
 %changelog
+* Wed Apr 12 2023 liweiganga <liweiganga@uniontech.com> -1.20.11-18
+- fix CVE-2023-1393
+
+* Mon Mar 20 2023 liweiganga <liweiganga@uniontech.com> -1.20.11-17
+- feat: all man files is provided by help package
+
+* Fri Feb 17 2023 liweiganga <liweiganga@uniontech.com> -1.20.11-16
+- fix CVE-2023-0494
+
 * Tue Jan 10 2023 zhouwenpei <zhouwenpei1@h-partners.com> -1.20.11-15
 - add missing patches