diff --git a/xwayland-22.1.7.tar.xz b/xwayland-22.1.7.tar.xz
deleted file mode 100644
index a714651..0000000
--- a/xwayland-22.1.7.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d53afac6c71953f5cf66d03d289dacd8961da5bd309c1dff125d5955d9db5f76
-size 1273476
diff --git a/xwayland-22.1.7.tar.xz.sig b/xwayland-22.1.7.tar.xz.sig
deleted file mode 100644
index 788de47..0000000
Binary files a/xwayland-22.1.7.tar.xz.sig and /dev/null differ
diff --git a/xwayland-22.1.8.tar.xz b/xwayland-22.1.8.tar.xz
new file mode 100644
index 0000000..dc1c560
--- /dev/null
+++ b/xwayland-22.1.8.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d11eeee73290b88ea8da42a7d9350dedfaba856ce4ae44e58c045ad9ecaa2f73
+size 1273668
diff --git a/xwayland-22.1.8.tar.xz.sig b/xwayland-22.1.8.tar.xz.sig
new file mode 100644
index 0000000..c3e67d2
Binary files /dev/null and b/xwayland-22.1.8.tar.xz.sig differ
diff --git a/xwayland.changes b/xwayland.changes
index f133929..5585808 100644
--- a/xwayland.changes
+++ b/xwayland.changes
@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Tue Feb  7 14:29:21 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to version 22.1.8
+  * This release contains the fix for CVE-2023-0494 in today's
+    security advisory: 
+    https://lists.x.org/archives/xorg-announce/2023-February/003320.html
+  * It also fixes a second possible OOB access during EnqueueEvent.
+- supersedes U_Xi-fix-potential-use-after-free-in-DeepCopyPointerCl.patch
+
+-------------------------------------------------------------------
+Thu Feb  2 15:39:06 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
+
+- improved summary and description 
+- added requires to xkeyboard-config
+- added recommends to xorg-x11-fonts-core
+- removed unused 'package' section
+
+-------------------------------------------------------------------
+Wed Feb  1 10:06:15 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
+
+- U_Xi-fix-potential-use-after-free-in-DeepCopyPointerCl.patch
+  * DeepCopyPointerClasses use-after-free (CVE-2023-0494, 
+    ZDI-CAN-19596, bsc#1207783)
+
 -------------------------------------------------------------------
 Sat Dec 31 15:51:38 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/xwayland.spec b/xwayland.spec
index bb54dd8..8f2c47c 100644
--- a/xwayland.spec
+++ b/xwayland.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xwayland
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,10 +24,10 @@
 %endif
 
 Name:           xwayland
-Version:        22.1.7
+Version:        22.1.8
 Release:        0
 URL:            http://xorg.freedesktop.org
-Summary:        X
+Summary:        Xwayland Xserver
 License:        MIT
 Group:          System/X11/Servers/XF86_4
 Source0:        %{url}/archive/individual/xserver/%{name}-%{version}.tar.xz
@@ -93,7 +93,8 @@ Requires(pre):  %fillup_prereq
 %endif
 Requires:       pkgconfig
 Requires:       xkbcomp
-#Recommends:     xorg-x11-fonts-core
+Requires:       xkeyboard-config
+Recommends:     xorg-x11-fonts-core
 %ifnarch s390 s390x
 Requires:       libpixman-1-0
 %endif
@@ -101,16 +102,6 @@ Obsoletes:      xorg-x11-server-wayland < %{version}
 Provides:       xorg-x11-server-wayland = %{version}
 
 %description
-This package contains the Xwayland Server.
-
-%package %{name}
-Summary:        Xwayland Xserver
-Group:          System/X11/Servers/XF86_4
-Requires:       xkbcomp
-Requires:       xkeyboard-config
-Recommends:     xorg-x11-fonts-core
-
-%description %{name}
 This package contains the Xserver running on the Wayland Display Server.
 
 %package devel