diff --git a/at-spi2-core/PKGBUILD b/at-spi2-core/PKGBUILD
index 356f523..df088c2 100644
--- a/at-spi2-core/PKGBUILD
+++ b/at-spi2-core/PKGBUILD
@@ -8,7 +8,7 @@
 pkgbase=at-spi2-core
 pkgname=(at-spi2-core) # at-spi2-core-docs) # uncomment the docs sections and modify this pkg list to build the docs documents
 pkgver=2.46.0
-pkgrel=03
+pkgrel=04
 #  Arch replaced makedependency from libsystemd to systemd, the reason for the rerun 2.44.0-2
 #  Let's see if it makes a difference to us :)  :P
 pkgdesc="Protocol definitions and daemon for D-Bus at-spi w/o systemd"
@@ -67,6 +67,7 @@ package_at-spi2-core() {
 
   mkdir -p doc/usr/share
   mv {"$pkgdir",doc}/usr/share/gtk-doc
+  rm -rf $pkgdir/usr/lib/systemd/user/at-spi-dbus-bus.service
   rm -rf $pkgdir/usr/lib/systemd
 }
 
@@ -77,7 +78,6 @@ package_at-spi2-core() {
 #  mv doc/* "$pkgdir"
 #
 #  meson install -C build --destdir "$pkgdir"
-#  rm -rf $pkgdir/usr/lib/systemd/user/at-spi-dbus-bus.service
 #}
 
 #---- license gpg-key sha256sums ----
diff --git a/xf86-video-vesa/PKGBUILD b/xf86-video-vesa/PKGBUILD
index 0a7f4b6..41a17ae 100644
--- a/xf86-video-vesa/PKGBUILD
+++ b/xf86-video-vesa/PKGBUILD
@@ -6,8 +6,8 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------
 
 pkgname=xf86-video-vesa
-pkgver=2.5.0
-pkgrel=03
+pkgver=2.6.0
+pkgrel=01
 pkgdesc="X.org vesa video driver"
 arch=(x86_64)
 url="https://xorg.freedesktop.org/"
@@ -16,13 +16,12 @@ makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=25.2')
 conflicts=('xorg-server<21.1.1' 'X-ABI-VIDEODRV_VERSION<25' 'X-ABI-VIDEODRV_VERSION>=26')
 #options=('debug')  ###  uncomment this to also build the debug pkg
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}
-        0001-Refuse-to-run-if-framebuffer-or-dri-devices-are-pres.patch)
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.xz{,.sig})
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  # https://gitlab.freedesktop.org/xorg/driver/xf86-video-vesa/-/merge_requests/5
-  patch -Np1 -i ../0001-Refuse-to-run-if-framebuffer-or-dri-devices-are-pres.patch
+#  # https://gitlab.freedesktop.org/xorg/driver/xf86-video-vesa/-/merge_requests/5
+#  patch -Np1 -i ../0001-Refuse-to-run-if-framebuffer-or-dri-devices-are-pres.patch
 }
 
 build() {
@@ -50,10 +49,10 @@ package() {
 
 license=('custom')
 
-validpgpkeys=('DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3') #  "Adam Jackson <ajax@nwnk.net>"
-validpgpkeys+=('995ED5C8A6138EB0961F18474C09DD83CAAA50B2') # "Adam Jackson <ajax@nwnk.net>"
+#validpgpkeys=('DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3') #  "Adam Jackson <ajax@nwnk.net>"
+#validpgpkeys+=('995ED5C8A6138EB0961F18474C09DD83CAAA50B2') # "Adam Jackson <ajax@nwnk.net>"
+validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # "Alan Coopersmith <alan.coopersmith@oracle.com>"
 
-sha256sums=(1f1624f3c73906801ad1bc98335a2cb5676a7a4d18e5374d9a1d18464e54c659 # xf86-video-vesa-2.5.0.tar.bz2
-	573a90567db5d697c644565b86f7a4b6d1070438b4c6985e6810d4fdd0ae955d # xf86-video-vesa-2.5.0.tar.bz2.sig
-	ee8e4011cc11880f4ef651d9bd4b26c7f5d13554c76d883d70d12a98908898cb) # 0001-Refuse-to-run-if-framebuffer-or-dri-devices-are-pres.patch
+sha256sums=(10082771b1a8f659c60b3d9b70456a4b59948a75b3cade2dfa33b8b05e549bb1  # xf86-video-vesa-2.6.0.tar.xz
+	4c84dcdabfd1dd98e9f0702603417aeda7ca4954770fd7a3453e357110d5cc8b) # xf86-video-vesa-2.6.0.tar.xz.sig
 
diff --git a/xf86-video-vesa/PKGBUILD-arch b/xf86-video-vesa/PKGBUILD-arch
index 8145cc3..793ea92 100644
--- a/xf86-video-vesa/PKGBUILD-arch
+++ b/xf86-video-vesa/PKGBUILD-arch
@@ -1,8 +1,9 @@
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-vesa
-pkgver=2.5.0
-pkgrel=3
+pkgver=2.6.0
+pkgrel=1
 pkgdesc="X.org vesa video driver"
 arch=(x86_64)
 license=('custom')
@@ -12,20 +13,12 @@ makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=25.2')
 conflicts=('xorg-server<21.1.1' 'X-ABI-VIDEODRV_VERSION<25' 'X-ABI-VIDEODRV_VERSION>=26')
 groups=('xorg-drivers' 'xorg')
 options=('debug')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig}
-        0001-Refuse-to-run-if-framebuffer-or-dri-devices-are-pres.patch)
-sha512sums=('36fd921f54f33eb25966b5f9ea1e1b3e9009965c012c8b9c676686b472111719921b80cf62dafc746058878253e21f0ef341a2ff2d650df22ca1e35e81716a8b'
-            'SKIP'
-            '97fe6c8953bc026d53033fb53367208d70affcc2a05d0011fb71d5f95cba2f7c46c65cd64bc74609e97515052952f1d2342b5607e1d0fe2deb9dfcdcb077f200')
-validpgpkeys=('DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3') #  "Adam Jackson <ajax@nwnk.net>"
-validpgpkeys+=('995ED5C8A6138EB0961F18474C09DD83CAAA50B2') # "Adam Jackson <ajax@nwnk.net>"
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-
-  # https://gitlab.freedesktop.org/xorg/driver/xf86-video-vesa/-/merge_requests/5
-  patch -Np1 -i ../0001-Refuse-to-run-if-framebuffer-or-dri-devices-are-pres.patch
-}
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.xz{,.sig})
+sha512sums=('494e117c1e6e0ce4c66ac7798de54667862c62605bfd76dd9373447d40dcd0521100810c9285cbe9c159440e217954c0cad6d5219c5894e075509c7c0bc353c7'
+            'SKIP')
+#validpgpkeys=('DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3') #  "Adam Jackson <ajax@nwnk.net>"
+#validpgpkeys+=('995ED5C8A6138EB0961F18474C09DD83CAAA50B2') # "Adam Jackson <ajax@nwnk.net>"
+validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # "Alan Coopersmith <alan.coopersmith@oracle.com>"
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/xf86-video-vesa/clean b/xf86-video-vesa/clean
index 87f1aea..65e1e7a 100644
--- a/xf86-video-vesa/clean
+++ b/xf86-video-vesa/clean
@@ -1 +1 @@
-rm -rvf {src,pkg,xf86-video-ves*.tar.bz*}
+rm -rvf {src,pkg,xf86-video-ves*.tar.xz*}
diff --git a/xf86-video-vesa/key b/xf86-video-vesa/key
index 2aaeb42..abaadf7 100644
--- a/xf86-video-vesa/key
+++ b/xf86-video-vesa/key
@@ -1 +1,2 @@
 gpg -v --recv-key 4C09DD83CAAA50B2
+gpg -v --recv-key A2FB9E081F2D130E