diff --git a/xorg-server/PKGBUILD b/xorg-server/PKGBUILD
index 4f78acd..2b97185 100644
--- a/xorg-server/PKGBUILD
+++ b/xorg-server/PKGBUILD
@@ -8,8 +8,8 @@
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xvfb' 'xorg-server-xnest'
          'xorg-server-common' 'xorg-server-devel')
-pkgver=21.1.3
-pkgrel=07
+pkgver=21.1.4
+pkgrel=01
 arch=('x86_64')
 groups=('xorg')
 url="https://xorg.freedesktop.org"
@@ -25,23 +25,23 @@ source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pk
 	xvfb-run # with updates from FC master
 	xvfb-run.1
 	xorg-server.install
-	0001-xkb-fix-XkbSetMap-when-changing-a-keysym-without-cha.patch
+#	0001-xkb-fix-XkbSetMap-when-changing-a-keysym-without-cha.patch
 	0002-xephyr_Dont_check_for_SeatId_anymore.patch
-	0003-dix_Correctly_save_replayed_event_into_GrabInfoRec.patch
-	0004-present_Check_for_NULL_to_prevent_crash.patch
+#	0003-dix_Correctly_save_replayed_event_into_GrabInfoRec.patch
+#	0004-present_Check_for_NULL_to_prevent_crash.patch
 	Xwrapper.config)
 
 prepare() {
   cd ${pkgbase}-$pkgver
 
-  # merged in main
-  patch -Np1 -i ../0001-xkb-fix-XkbSetMap-when-changing-a-keysym-without-cha.patch
+#  # merged in main
+#  patch -Np1 -i ../0001-xkb-fix-XkbSetMap-when-changing-a-keysym-without-cha.patch
   # FS#73274
   patch -Np1 -i ../0002-xephyr_Dont_check_for_SeatId_anymore.patch
-  # FS#73875
-  patch -Np1 -i ../0003-dix_Correctly_save_replayed_event_into_GrabInfoRec.patch
-  # FS#73895
-  patch -Np1 -i ../0004-present_Check_for_NULL_to_prevent_crash.patch
+#  # FS#73875
+#  patch -Np1 -i ../0003-dix_Correctly_save_replayed_event_into_GrabInfoRec.patch
+#  # FS#73895
+#  patch -Np1 -i ../0004-present_Check_for_NULL_to_prevent_crash.patch
 
 }
 
@@ -192,28 +192,11 @@ license=('custom')
 
 validpgpkeys=('FD0004A26EADFE43A4C3F249C6F7AE200374452D') # Povilas Kanapickas <povilas@radix.lt>
 
-sha256sums=(61d6aad5b6b47a116b960bd7f0cba4ee7e6da95d6bb0b127bde75d7d1acdebe5 # xorg-server-21.1.3.tar.xz
-	b2afcbeaa9bb4e86758cf7b5e37a28de2e241855f5e22efe530be4b6c7f2cc7a # xorg-server-21.1.3.tar.xz.sig
+sha256sums=(5cc4be8ee47edb58d4a90e603a59d56b40291ad38371b0bd2471fc3cbee1c587 # xorg-server-21.1.4.tar.xz
+	c3053ee748f9b08d4afbaea098afa0a3adff374cb7ac10b4716cf8f773e3f251 # xorg-server-21.1.4.tar.xz.sig
 	a0a68505e3eb3ba6581388ae41b9dfd5208ec9b8983e78714778c20b71bc0ece # xvfb-run
 	2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776 # xvfb-run.1
 	57316bf08e1934f983b03d085ca318dc27eaca9dc137c61ca62074ecfd5ede11 # xorg-server.install
-	698aedfd056ed7fd617fa455b269b673072b5544ac7617e7f41e71e20b7083e2 # 0001-xkb-fix-XkbSetMap-when-changing-a-keysym-without-cha.patch
 	057004ab36d4733e6c275f76bbc3851f6cdb9063305a3ae874f2fd83f14a6dc0 # 0002-xephyr_Dont_check_for_SeatId_anymore.patch
-	e7049b851c303bf16ac862a2cf5a67a39c1c456a73aea66bcaa9882c968a092b # 0003-dix_Correctly_save_replayed_event_into_GrabInfoRec.patch
-	1cd5446f4f2d7c5ea11837f50c770e2704600310f9212971316c6e9fa763c69a # 0004-present_Check_for_NULL_to_prevent_crash.patch
 	1e02dbcce066746acb5de54c816add1d26349ff16b5f1833b6ab48f3b3a8e634) #  Xwrapper.config
  
-sha512sums=(cf5fed023eadda62ae732f8c4d427c272ebe005188341290f3d03147042c103b00cbb94d86a0256da815fb9b9a3da315c21a05ee0c926c1a2ff0c54ab0c0638b # xorg-server-21.1.3.tar.xz
-	d55172f41f55a01f56b4d2f0b61ccb25c53e45278d200346baa73cdb19e65a04cf876ba3adbc11b7548069866b9cd52a54e399a2256cf358b6a078479771d658 # xorg-server-21.1.3.tar.xz.sig
-	87c79b4a928e74463f96f58d277558783eac9b8ea6ba00d6bbbb67ad84c4d65b3792d960ea2a70089ae18162e82ae572a49ad36df169c974cc99dbaa51f63eb2 # xvfb-run
-	de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22 # xvfb-run.1
-	d8b010089776cde3b65e76d43ab97b3f186833cc1ff60233ce4ee089ee174b7f28b14b17074656e23be5fbd80830e237dd63aa78f8e8779fa548f4ba5101a0ee # xorg-server.install
-	bc3b955072f320ae72a771bebecbcf56637cd0448c3afa28149fcd9e0de3700e9fba1fec21fe283be77e1236e317e385f6970eb59df54d3181324c229c8309d7 # 0001-xkb-fix-XkbSetMap-when-changing-a-keysym-without-cha.patch
-	34de52147054535256f35143d321e4d5e189baae502afca2bd3291094946dbead0829b1f196ae2a4d23bd6d0e1e04b65a387dee43f12dee55d247e37aec419d7 # 0002-xephyr_Dont_check_for_SeatId_anymore.patch
-	01acc49ee9d0681b1ec3f9f22cd4e0dbaee2f5395ebe796e158e30c7d61890337a01fe7ace267d90d62e29f3d74b981391feb7cc5840c187d62f9433ce8e1fff #  0003-dix_Correctly_save_replayed_event_into_GrabInfoRec.patch
-	a61128b27b76b7089a4b43f9b679d9ecd607b5d8645fa5ef635902e4a51a7609e3bff0190d877117ce324d49a2711375850df2046f4cad99ea8a8c6cc8cf11fa # 0004-present_Check_for_NULL_to_prevent_crash.patch
-	97315b682bef7892d3cf641ea9add6e0d22901150763930020302cc73de5fe5bda0f47384b7d405c7169cb5f072d27da306066063d5a8ea116e97ea474caffe8) #  Xwrapper.config
- 
-
- 
- 
diff --git a/xorg-server/PKGBUILD-arch b/xorg-server/PKGBUILD-arch
index fb66dd0..e9b3c54 100644
--- a/xorg-server/PKGBUILD-arch
+++ b/xorg-server/PKGBUILD-arch
@@ -4,8 +4,8 @@
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xvfb' 'xorg-server-xnest'
          'xorg-server-common' 'xorg-server-devel')
-pkgver=21.1.3
-pkgrel=7
+pkgver=21.1.4
+pkgrel=1
 arch=('x86_64')
 license=('custom')
 groups=('xorg')
@@ -21,32 +21,20 @@ makedepends=('xorgproto' 'pixman' 'libx11' 'mesa' 'mesa-libgl' 'xtrans'
 source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.xz{,.sig}
         xvfb-run # with updates from FC master
         xvfb-run.1
-        0001-xkb-fix-XkbSetMap-when-changing-a-keysym-without-cha.patch
         0002-xephyr_Dont_check_for_SeatId_anymore.patch
-        0003-dix_Correctly_save_replayed_event_into_GrabInfoRec.patch
-        0004-present_Check_for_NULL_to_prevent_crash.patch
 )
 validpgpkeys=('FD0004A26EADFE43A4C3F249C6F7AE200374452D') # Povilas Kanapickas <povilas@radix.lt>
-sha512sums=('cf5fed023eadda62ae732f8c4d427c272ebe005188341290f3d03147042c103b00cbb94d86a0256da815fb9b9a3da315c21a05ee0c926c1a2ff0c54ab0c0638b'
+sha512sums=('eb5b8520d02908f72719e6ecfbf7a9bf139acb65ccae04d1db4223a8a2384cd3a94bd5afef10cce327b751b800cc2b79bfaa5ae35c95c3a217f775168082e68f'
             'SKIP'
             '87c79b4a928e74463f96f58d277558783eac9b8ea6ba00d6bbbb67ad84c4d65b3792d960ea2a70089ae18162e82ae572a49ad36df169c974cc99dbaa51f63eb2'
             'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22'
-            'bc3b955072f320ae72a771bebecbcf56637cd0448c3afa28149fcd9e0de3700e9fba1fec21fe283be77e1236e317e385f6970eb59df54d3181324c229c8309d7'
-            '34de52147054535256f35143d321e4d5e189baae502afca2bd3291094946dbead0829b1f196ae2a4d23bd6d0e1e04b65a387dee43f12dee55d247e37aec419d7'
-            '01acc49ee9d0681b1ec3f9f22cd4e0dbaee2f5395ebe796e158e30c7d61890337a01fe7ace267d90d62e29f3d74b981391feb7cc5840c187d62f9433ce8e1fff'
-            'a61128b27b76b7089a4b43f9b679d9ecd607b5d8645fa5ef635902e4a51a7609e3bff0190d877117ce324d49a2711375850df2046f4cad99ea8a8c6cc8cf11fa')
+            '34de52147054535256f35143d321e4d5e189baae502afca2bd3291094946dbead0829b1f196ae2a4d23bd6d0e1e04b65a387dee43f12dee55d247e37aec419d7')
 
 prepare() {
   cd ${pkgbase}-$pkgver
 
-  # merged in main
-  patch -Np1 -i ../0001-xkb-fix-XkbSetMap-when-changing-a-keysym-without-cha.patch
   # FS#73274
   patch -Np1 -i ../0002-xephyr_Dont_check_for_SeatId_anymore.patch
-  # FS#73875
-  patch -Np1 -i ../0003-dix_Correctly_save_replayed_event_into_GrabInfoRec.patch
-  # FS#73895
-  patch -Np1 -i ../0004-present_Check_for_NULL_to_prevent_crash.patch
 }
 
 build() {
diff --git a/xorg-server/deps b/xorg-server/deps
index 2d9d5f7..071699c 100644
--- a/xorg-server/deps
+++ b/xorg-server/deps
@@ -28,3 +28,4 @@ libunwind
 meson
 git
 
+
diff --git a/xorg-server/time b/xorg-server/time
index 68c0d29..9bc972b 100644
--- a/xorg-server/time
+++ b/xorg-server/time
@@ -1,4 +1,4 @@
-real	2m45.138s
-user	9m6.781s
-sys	0m27.426s
+real	2m55.363s
+user	10m16.237s
+sys	0m29.990s