diff --git a/packages/asunder.rb b/packages/asunder.rb
index d356d363c..368902fff 100644
--- a/packages/asunder.rb
+++ b/packages/asunder.rb
@@ -25,7 +25,7 @@ class Asunder < Package
      x86_64: '46865361e0deeaef1539d52dc35daeb28c1b322b947a00a3b7c15580212ba686'
   })
 
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'at_spi2_core' # R
   depends_on 'cdparanoia' # R
   depends_on 'freetype' # R
diff --git a/packages/at_spi2_atk.rb b/packages/at_spi2_atk.rb
index 0fb2d2683..cacc8fb48 100644
--- a/packages/at_spi2_atk.rb
+++ b/packages/at_spi2_atk.rb
@@ -1,38 +1,15 @@
 require 'package'
+require_relative 'at_spi2_core'
 
 class At_spi2_atk < Package
   description 'D-Bus AT-SPI'
   homepage 'http://www.freedesktop.org/'
-  version '2.38.0'
+  @atkversion = At_spi2_core.version
+  version @atkversion
   license 'LGPL-2.1+'
   compatibility 'all'
-  source_url 'https://github.com/GNOME/at-spi2-atk/archive/AT_SPI2_ATK_2_38_0.tar.gz'
-  source_sha256 '95f10c80834d3811938153199da671967ee3c8f378883ed3f6ddeee1d316d3e4'
 
-  binary_url({
-    aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/at_spi2_atk/2.38.0_armv7l/at_spi2_atk-2.38.0-chromeos-armv7l.tar.xz',
-      armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/at_spi2_atk/2.38.0_armv7l/at_spi2_atk-2.38.0-chromeos-armv7l.tar.xz',
-        i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/at_spi2_atk/2.38.0_i686/at_spi2_atk-2.38.0-chromeos-i686.tar.xz',
-      x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/at_spi2_atk/2.38.0_x86_64/at_spi2_atk-2.38.0-chromeos-x86_64.tar.xz'
-  })
-  binary_sha256({
-    aarch64: '097744ccba6da2013771b9da22a887e64cd6fd0df0b39bc1576e9131e1ff30a9',
-      armv7l: '097744ccba6da2013771b9da22a887e64cd6fd0df0b39bc1576e9131e1ff30a9',
-        i686: '12aba0b16a694f3e79e7fa562bfd7510c27d8d4864a5b57f9caed48e7801a890',
-      x86_64: 'ce793ff57e4c0ba75b76e8f12934741f6cb26b4d02cc9080e647c28170b1f627'
-  })
-
-  depends_on 'automake' => :build
   depends_on 'at_spi2_core'
-  depends_on 'atk'
 
-  def self.build
-    system "meson setup #{CREW_MESON_OPTIONS} builddir"
-    system 'meson configure builddir'
-    system 'ninja -C builddir'
-  end
-
-  def self.install
-    system "DESTDIR=#{CREW_DEST_DIR} ninja -C builddir install"
-  end
+  is_fake
 end
diff --git a/packages/at_spi2_core.rb b/packages/at_spi2_core.rb
index c3f490586..618640374 100644
--- a/packages/at_spi2_core.rb
+++ b/packages/at_spi2_core.rb
@@ -3,39 +3,37 @@ require 'package'
 class At_spi2_core < Package
   description 'This is over DBus, tookit widgets provide their content to screen readers such as Orca'
   homepage 'http://www.freedesktop.org/'
-  version '2.46.0'
+  version '2.47.90'
   compatibility 'all'
   source_url 'https://gitlab.gnome.org/GNOME/at-spi2-core.git'
   git_hashtag "AT_SPI2_CORE_#{version.gsub('.', '_')}"
 
   binary_url({
-    aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/at_spi2_core/2.46.0_armv7l/at_spi2_core-2.46.0-chromeos-armv7l.tar.zst',
-     armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/at_spi2_core/2.46.0_armv7l/at_spi2_core-2.46.0-chromeos-armv7l.tar.zst',
-       i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/at_spi2_core/2.46.0_i686/at_spi2_core-2.46.0-chromeos-i686.tar.zst',
-     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/at_spi2_core/2.46.0_x86_64/at_spi2_core-2.46.0-chromeos-x86_64.tar.zst'
+    aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/at_spi2_core/2.47.90_armv7l/at_spi2_core-2.47.90-chromeos-armv7l.tar.zst',
+     armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/at_spi2_core/2.47.90_armv7l/at_spi2_core-2.47.90-chromeos-armv7l.tar.zst',
+       i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/at_spi2_core/2.47.90_i686/at_spi2_core-2.47.90-chromeos-i686.tar.zst',
+     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/at_spi2_core/2.47.90_x86_64/at_spi2_core-2.47.90-chromeos-x86_64.tar.zst'
   })
   binary_sha256({
-    aarch64: 'e41f66f60dc1cf250c5261fbb273a28235de94f07eb7875b47e7e911952f07f3',
-     armv7l: 'e41f66f60dc1cf250c5261fbb273a28235de94f07eb7875b47e7e911952f07f3',
-       i686: '84715693ae536e4971ed770b0c8b4dfe3ba9b01672c18608ba962c7acd225318',
-     x86_64: '34da69bd9bc905ca3cd2fcd57bb2f2acfdb91ce7cc0fb48dd2bb02c8acada64b'
+    aarch64: 'a2c7a6a2940417efd641837d8613070cde1db49a9472c614e02cb1976d95d89d',
+     armv7l: 'a2c7a6a2940417efd641837d8613070cde1db49a9472c614e02cb1976d95d89d',
+       i686: '3f188d3d336b7e5bdf1e1754a4679b8da0b2750b1332b28fd6874dd1fb61aaae',
+     x86_64: 'e68621afe44bef2d25c45026c2cd08b4cf6d707aa2100dcde61d8594a6bec4fe'
   })
 
-  depends_on 'libxtst'
-  depends_on 'dbus'
-  depends_on 'glib'
-  depends_on 'gobject_introspection'
-  depends_on 'libxcb'
-  depends_on 'gtk_doc'
-  depends_on 'atk' # R
-  depends_on 'at_spi2_atk' # R
-  depends_on 'glibc' # R
-  depends_on 'libxext' # R
-  depends_on 'libx11' # R
-  depends_on 'libxi' # R
+  depends_on 'dbus' # R
   depends_on 'gcc' # R
+  depends_on 'glibc' # R
+  depends_on 'glib' # R
+  depends_on 'gobject_introspection' => :build
+  depends_on 'gtk_doc' => :build
+  depends_on 'libx11' # R
+  depends_on 'libxcb' => :build
+  depends_on 'libxext' => :build
+  depends_on 'libxfixes' => :build
+  depends_on 'libxi' # R
+  depends_on 'libxtst' # R
 
-  conflicts_ok # Doesn't actually conflict with atk
   gnome
 
   def self.build
diff --git a/packages/atk.rb b/packages/atk.rb
index b511158a6..3589afd49 100644
--- a/packages/atk.rb
+++ b/packages/atk.rb
@@ -1,41 +1,15 @@
 require 'package'
+require_relative 'at_spi2_core'
 
 class Atk < Package
   description 'ATK provides the set of accessibility interfaces that are implemented by other toolkits and applications'
   homepage 'https://developer.gnome.org/atk'
-  version '2.38.0'
+  @atkversion = At_spi2_core.version
+  version @atkversion
   compatibility 'all'
   license 'LGPL-2+'
-  source_url 'https://gitlab.gnome.org/GNOME/atk.git'
-  git_hashtag version
 
-  binary_url({
-    aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/atk/2.38.0_armv7l/atk-2.38.0-chromeos-armv7l.tar.zst',
-     armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/atk/2.38.0_armv7l/atk-2.38.0-chromeos-armv7l.tar.zst',
-       i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/atk/2.38.0_i686/atk-2.38.0-chromeos-i686.tar.zst',
-     x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/atk/2.38.0_x86_64/atk-2.38.0-chromeos-x86_64.tar.zst'
-  })
-  binary_sha256({
-    aarch64: 'f80a8f01834b6fa38b39e89167cae48022df2923294e0c4878d5c6f71cee1e30',
-     armv7l: 'f80a8f01834b6fa38b39e89167cae48022df2923294e0c4878d5c6f71cee1e30',
-       i686: 'ea99101c13aa53d25f1279de503718c97371b846b4b4fa46a9baf88189455040',
-     x86_64: '2753924328d479e845521c4cdd8ab958537c7a1f63107bda44a6937d1d330419'
-  })
+  depends_on 'at_spi2_core'
 
-  depends_on 'gobject_introspection'
-  depends_on 'glib' # R
-  depends_on 'glibc' # R
-
-  gnome
-
-  def self.build
-    system "meson setup #{CREW_MESON_OPTIONS} \
-    builddir"
-    system 'meson configure builddir'
-    system 'mold -run samu -C builddir'
-  end
-
-  def self.install
-    system "DESTDIR=#{CREW_DEST_DIR} samu -C builddir install"
-  end
+  is_fake
 end
diff --git a/packages/atkmm.rb b/packages/atkmm.rb
index 28c749d46..beaf07cf2 100644
--- a/packages/atkmm.rb
+++ b/packages/atkmm.rb
@@ -22,7 +22,7 @@ class Atkmm < Package
      x86_64: '86017c202ce153168975d2bac00d6777961dc9af26ded6d058e8a70537400a8e'
   })
 
-  depends_on 'atk'
+  depends_on 'at_spi2_core'
   depends_on 'glibmm'
   depends_on 'gcc' # R
   depends_on 'glib' # R
diff --git a/packages/clutter.rb b/packages/clutter.rb
index 216673415..a189a3e11 100644
--- a/packages/clutter.rb
+++ b/packages/clutter.rb
@@ -22,7 +22,7 @@ class Clutter < Package
      x86_64: '1fc7d581d9c66bf0d415cddf76e561428d8610513d41c89ed130a84e3acc605c'
   })
 
-  depends_on 'atk'
+  depends_on 'at_spi2_core'
   depends_on 'pango'
   depends_on 'libxi'
   depends_on 'libxcomposite'
diff --git a/packages/codium.rb b/packages/codium.rb
index b0789e0f5..b42de6f58 100644
--- a/packages/codium.rb
+++ b/packages/codium.rb
@@ -18,8 +18,7 @@ class Codium < Package
   end
 
   depends_on 'alsa_lib' # R
-  depends_on 'atk' # R
-  depends_on 'at_spi2_atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'at_spi2_core' # R
   depends_on 'cups' # R
   depends_on 'dbus' # R
diff --git a/packages/epiphany.rb b/packages/epiphany.rb
index 5abca91b3..3ee1d4569 100644
--- a/packages/epiphany.rb
+++ b/packages/epiphany.rb
@@ -23,7 +23,7 @@ class Epiphany < Package
      x86_64: '0757192bb0ba72bf09da813e4ddabee332f3ae9ad1b8d621a3f9b23bf8658305'
   })
 
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'at_spi2_core' # R
   depends_on 'docbook_xml' => :build
   depends_on 'freetype' => :build
diff --git a/packages/ettercap_gtk.rb b/packages/ettercap_gtk.rb
index ed1d6831c..c37866d38 100644
--- a/packages/ettercap_gtk.rb
+++ b/packages/ettercap_gtk.rb
@@ -23,7 +23,7 @@ class Ettercap_gtk < Package
       x86_64: '79fa1456b6486a304d9d4f45e7ebf7ec9a2565ebd19d0947b142676af997deeb'
   })
 
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'at_spi2_core' # R
   depends_on 'curl' => :build
   depends_on 'ethtool' => :build
diff --git a/packages/evince.rb b/packages/evince.rb
index 90c4829c5..121918bce 100644
--- a/packages/evince.rb
+++ b/packages/evince.rb
@@ -25,7 +25,7 @@ class Evince < Package
      x86_64: 'dc46b37780ac1b9f5c400a3bd8b4c8f01a0752b287747ced776e62b7be053cf5'
   })
 
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'cairo' # R
   depends_on 'djvulibre' # R
   depends_on 'docbook_xsl' => :build
diff --git a/packages/evolution_data_server.rb b/packages/evolution_data_server.rb
index 6ac6dfecc..c604d9a76 100644
--- a/packages/evolution_data_server.rb
+++ b/packages/evolution_data_server.rb
@@ -22,7 +22,7 @@ class Evolution_data_server < Package
      x86_64: '57189bbc3c4fa355db5d3e64dc89521f91e7366eadb251b993bd963ec573d1d3'
   })
 
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'at_spi2_core' # R
   depends_on 'gcc' # R
   depends_on 'gcr_3' # R
diff --git a/packages/firefox.rb b/packages/firefox.rb
index b2c33fac9..fc89b0c71 100644
--- a/packages/firefox.rb
+++ b/packages/firefox.rb
@@ -19,7 +19,7 @@ class Firefox < Package
   no_compile_needed
   no_shrink
 
-  depends_on 'atk'
+  depends_on 'at_spi2_core'
   depends_on 'cairo'
   depends_on 'dbus'
   depends_on 'dbus_glib'
diff --git a/packages/geany.rb b/packages/geany.rb
index 2226d4a80..7b698cab5 100644
--- a/packages/geany.rb
+++ b/packages/geany.rb
@@ -22,7 +22,7 @@ class Geany < Package
      x86_64: 'dd80c365678847a11d7cd2c2b1dcc9d6d88b50fa573a895d506555113ea973d7'
   })
 
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'cairo' # R
   depends_on 'gdk_pixbuf' # R
   depends_on 'glib' # R
diff --git a/packages/geany_plugins.rb b/packages/geany_plugins.rb
index cfed3ef63..afab57fa0 100644
--- a/packages/geany_plugins.rb
+++ b/packages/geany_plugins.rb
@@ -22,7 +22,7 @@ class Geany_plugins < Package
      x86_64: '410488ee35fefbd1e502ead3a67fde697ac48ee8a8ecd6de1217951db382e08a'
   })
 
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'cairo' # R
   depends_on 'enchant' # R
   depends_on 'gdk_pixbuf' # R
diff --git a/packages/gedit.rb b/packages/gedit.rb
index 34682b5e5..894ff8983 100644
--- a/packages/gedit.rb
+++ b/packages/gedit.rb
@@ -23,7 +23,7 @@ class Gedit < Package
   })
 
   depends_on 'amtk' # R
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'cairo' # R
   depends_on 'gdk_pixbuf' # R
   depends_on 'glib' # R
diff --git a/packages/gemacs.rb b/packages/gemacs.rb
index 94bb772bd..ee2e47207 100644
--- a/packages/gemacs.rb
+++ b/packages/gemacs.rb
@@ -24,7 +24,7 @@ class Gemacs < Package
 
   depends_on 'acl' # R
   depends_on 'alsa_lib' # R
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'at_spi2_core' # R
   depends_on 'cairo'
   depends_on 'dbus' # R
diff --git a/packages/ghostscript.rb b/packages/ghostscript.rb
index 13663be84..885085319 100644
--- a/packages/ghostscript.rb
+++ b/packages/ghostscript.rb
@@ -22,7 +22,7 @@ class Ghostscript < Package
      x86_64: 'c3c1f1ac1c31ea6a465367504156c18d47bae8b1ecbaee3b118e3bbc3b25a5a9'
   })
 
-  depends_on 'atk'
+  depends_on 'at_spi2_core'
   depends_on 'cairo'
   depends_on 'cups'
   depends_on 'fontconfig'
diff --git a/packages/gimp.rb b/packages/gimp.rb
index 54f903f36..e3b39dc9e 100644
--- a/packages/gimp.rb
+++ b/packages/gimp.rb
@@ -25,7 +25,7 @@ class Gimp < Package
   depends_on 'aalib' # R
   depends_on 'alsa_lib' # R
   depends_on 'appstream_glib' # R
-  depends_on 'atk' => :build
+  depends_on 'at_spi2_core' => :build
   depends_on 'babl' # R
   depends_on 'bz2' # R
   depends_on 'cairo' # R
diff --git a/packages/github_desktop.rb b/packages/github_desktop.rb
index ad94dc18d..389189ff1 100644
--- a/packages/github_desktop.rb
+++ b/packages/github_desktop.rb
@@ -14,7 +14,7 @@ class Github_desktop < Package
   binary_sha256({
   })
 
-  depends_on 'at_spi2_atk'
+  depends_on 'at_spi2_core'
   depends_on 'gdk_pixbuf'
   depends_on 'libcom_err'
   depends_on 'xdg_base'
diff --git a/packages/gnome_autoar.rb b/packages/gnome_autoar.rb
index 60d94711a..0ad5261c3 100644
--- a/packages/gnome_autoar.rb
+++ b/packages/gnome_autoar.rb
@@ -23,7 +23,7 @@ class Gnome_autoar < Package
      x86_64: 'f5171c23c19d2f72ad51152def99143cb502b99c41d1ec850e1cdb6e741dd349'
   })
 
-  depends_on 'atk'
+  depends_on 'at_spi2_core'
   depends_on 'autoconf_archive' => :build
   depends_on 'cairo'
   depends_on 'gdk_pixbuf'
diff --git a/packages/gnome_terminal.rb b/packages/gnome_terminal.rb
index 679f9c249..328c8c0fc 100644
--- a/packages/gnome_terminal.rb
+++ b/packages/gnome_terminal.rb
@@ -24,7 +24,7 @@ class Gnome_terminal < Package
   })
 
   depends_on 'adobe_source_code_pro_fonts' # (Needed for monospace fonts)
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'at_spi2_core' # R
   depends_on 'dconf' => :build
   depends_on 'dbus' # L
diff --git a/packages/graphviz.rb b/packages/graphviz.rb
index 3daf23387..3f14a4809 100644
--- a/packages/graphviz.rb
+++ b/packages/graphviz.rb
@@ -23,7 +23,7 @@ class Graphviz < Package
      x86_64: 'ce900808e60f7fcc5a558a6fe50d8700ccf5f25528a11227d52750ec72621f31'
   })
 
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'at_spi2_core' # R
   depends_on 'cairo' => :build
   depends_on 'expat' # R
diff --git a/packages/gspell.rb b/packages/gspell.rb
index 420015030..e9e00fee1 100644
--- a/packages/gspell.rb
+++ b/packages/gspell.rb
@@ -34,7 +34,7 @@ class Gspell < Package
   depends_on 'llvm' => :build
   depends_on 'hunspell'
   depends_on 'aspell' # R
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'gcc' # R
   depends_on 'gdk_pixbuf' # R
   depends_on 'glib' # R
diff --git a/packages/gstreamer.rb b/packages/gstreamer.rb
index 41f696ebd..4d8e81634 100644
--- a/packages/gstreamer.rb
+++ b/packages/gstreamer.rb
@@ -24,7 +24,7 @@ class Gstreamer < Package
   })
 
   depends_on 'alsa_lib' # R
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'at_spi2_core' # R
   depends_on 'bz2' # R
   depends_on 'cairo' # R
diff --git a/packages/gtk2.rb b/packages/gtk2.rb
index 2812861fe..6ebc98637 100644
--- a/packages/gtk2.rb
+++ b/packages/gtk2.rb
@@ -22,7 +22,7 @@ class Gtk2 < Package
      x86_64: '8bddd0719e044e3440c028bf86b16f60229d61c80dcfe29a2b88055fc1d0bbe0'
   })
 
-  depends_on 'atk'
+  depends_on 'at_spi2_core'
   depends_on 'cairo'
   depends_on 'cups'
   depends_on 'fontconfig'
diff --git a/packages/gtk3.rb b/packages/gtk3.rb
index 6c08c0295..98e86b058 100644
--- a/packages/gtk3.rb
+++ b/packages/gtk3.rb
@@ -26,8 +26,8 @@ class Gtk3 < Package
 
   # L = Logical Dependency, R = Runtime Dependency
   depends_on 'adwaita_icon_theme' # L
-  depends_on 'atk' # R
-  depends_on 'at_spi2_atk' # R
+  depends_on 'at_spi2_core' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'cairo' # R
   depends_on 'cantarell_fonts' # L
   depends_on 'cups' # R
diff --git a/packages/gtksharp2.rb b/packages/gtksharp2.rb
index ba2a20c20..2f8e898bb 100644
--- a/packages/gtksharp2.rb
+++ b/packages/gtksharp2.rb
@@ -25,7 +25,7 @@ class Gtksharp2 < Package
   depends_on 'mono'
   depends_on 'libglade'
   depends_on 'pango'
-  depends_on 'atk'
+  depends_on 'at_spi2_core'
   depends_on 'gtk2'
   depends_on 'glib'
 
diff --git a/packages/gtksourceview_3.rb b/packages/gtksourceview_3.rb
index c8eb5ae83..c62a05fb1 100644
--- a/packages/gtksourceview_3.rb
+++ b/packages/gtksourceview_3.rb
@@ -23,7 +23,7 @@ class Gtksourceview_3 < Package
      x86_64: '539da69432b1494f60cdc5d498f0ec13d89835688b3775a1b0a7d72c671b8454'
   })
 
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'at_spi2_core' # R
   depends_on 'cairo' => :build
   depends_on 'fontconfig' => :build
diff --git a/packages/gtksourceview_4.rb b/packages/gtksourceview_4.rb
index 41d027db5..3e2e4b90a 100644
--- a/packages/gtksourceview_4.rb
+++ b/packages/gtksourceview_4.rb
@@ -23,7 +23,7 @@ class Gtksourceview_4 < Package
      x86_64: 'a9c2b5d14d3b1603ed0400edd45aa2ca907d1bdf413c85623152788ed342d494'
   })
 
-  depends_on 'atk'
+  depends_on 'at_spi2_core'
   depends_on 'cairo'
   depends_on 'fontconfig'
   depends_on 'freetype'
diff --git a/packages/gtksourceview_5.rb b/packages/gtksourceview_5.rb
index fd6189698..d313a9ed0 100644
--- a/packages/gtksourceview_5.rb
+++ b/packages/gtksourceview_5.rb
@@ -23,7 +23,7 @@ class Gtksourceview_5 < Package
      x86_64: '025bfd8d5b98858324e8590e0f3fb813b5f7464e63bfe2e346f9925fe153ef69'
   })
 
-  depends_on 'atk'
+  depends_on 'at_spi2_core'
   depends_on 'cairo'
   depends_on 'fontconfig'
   depends_on 'freetype'
diff --git a/packages/handbrake.rb b/packages/handbrake.rb
index 8d044f7de..2a4132349 100644
--- a/packages/handbrake.rb
+++ b/packages/handbrake.rb
@@ -16,7 +16,7 @@ class Handbrake < Package
     x86_64: '1863142bbbaec234618c56397c2a4474dfa05fb69e2faeabe0d9524a79e9288b'
   })
 
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'at_spi2_core' # R
   depends_on 'bz2' # R
   depends_on 'expat' # R
diff --git a/packages/ibus.rb b/packages/ibus.rb
index 01d22a6ef..bcbe3e52d 100644
--- a/packages/ibus.rb
+++ b/packages/ibus.rb
@@ -23,7 +23,7 @@ class Ibus < Package
      x86_64: '85e9181167b7238411d198bff3f673d40693b8391e0dd1a4cc1bbaaa4ce02303'
   })
 
-  depends_on 'atk'
+  depends_on 'at_spi2_core'
   depends_on 'cairo'
   depends_on 'dconf'
   depends_on 'fontconfig'
diff --git a/packages/inkscape.rb b/packages/inkscape.rb
index 769af680d..ce8eb4d23 100644
--- a/packages/inkscape.rb
+++ b/packages/inkscape.rb
@@ -23,7 +23,7 @@ class Inkscape < Package
   })
 
   depends_on 'atkmm' # R
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'at_spi2_core' # R
   depends_on 'bdwgc' # R
   depends_on 'boost' # R
diff --git a/packages/libglade.rb b/packages/libglade.rb
index 0dc22d323..6e15aac9b 100644
--- a/packages/libglade.rb
+++ b/packages/libglade.rb
@@ -22,7 +22,7 @@ class Libglade < Package
      x86_64: 'a950a82a9b670902efd4418b9947ef47764520811fd65d2623ddc8416d818f05'
   })
 
-  depends_on 'atk'
+  depends_on 'at_spi2_core'
   depends_on 'cairo'
   depends_on 'fontconfig'
   depends_on 'freetype'
diff --git a/packages/libhandy.rb b/packages/libhandy.rb
index 6a35a4707..ab93e6e70 100644
--- a/packages/libhandy.rb
+++ b/packages/libhandy.rb
@@ -23,7 +23,7 @@ class Libhandy < Package
      x86_64: '5bb6704da3f64fb2a1259fc79dae2680804d007316c552c23a8eefb506ca53f2'
   })
 
-  depends_on 'atk'
+  depends_on 'at_spi2_core'
   depends_on 'cairo'
   depends_on 'fribidi'
   depends_on 'gdk_pixbuf'
diff --git a/packages/libjxl.rb b/packages/libjxl.rb
index c747bb987..124aae229 100644
--- a/packages/libjxl.rb
+++ b/packages/libjxl.rb
@@ -32,7 +32,7 @@ class Libjxl < Package
   depends_on 'gimp' => :build
   depends_on 'libjpeg' # This needs to be turbo.
   depends_on 'xdg_utils' => :build
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'babl' # R
   depends_on 'freetype' # R
   depends_on 'gcc' # R
diff --git a/packages/mjpegtools.rb b/packages/mjpegtools.rb
index 9c34bbaf4..822a92a21 100644
--- a/packages/mjpegtools.rb
+++ b/packages/mjpegtools.rb
@@ -30,7 +30,7 @@ class Mjpegtools < Package
   depends_on 'libsdl2'
   depends_on 'libx11'
   depends_on 'v4l_utils' => :build
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'expat' # R
   depends_on 'freetype' # R
   depends_on 'gcc' # R
diff --git a/packages/nautilus.rb b/packages/nautilus.rb
index b02f4d9f5..9892d1595 100644
--- a/packages/nautilus.rb
+++ b/packages/nautilus.rb
@@ -27,7 +27,7 @@ class Nautilus < Package
   })
 
   depends_on 'appstream_glib' => :build
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'cairo' # R
   depends_on 'dconf'
   depends_on 'gdk_pixbuf' # R
diff --git a/packages/qemu.rb b/packages/qemu.rb
index 9f1b06d9c..238b95635 100644
--- a/packages/qemu.rb
+++ b/packages/qemu.rb
@@ -21,7 +21,7 @@ class Qemu < Package
   })
 
   depends_on 'alsa_lib' # R
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'cairo' # R
   depends_on 'eudev' # R
   depends_on 'fontconfig' # R
diff --git a/packages/qtbase.rb b/packages/qtbase.rb
index 7596afa23..4cbd26b55 100644
--- a/packages/qtbase.rb
+++ b/packages/qtbase.rb
@@ -23,7 +23,7 @@ class Qtbase < Package
   })
 
   depends_on 'alsa_plugins' => :build
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'at_spi2_core' # R
   depends_on 'cairo' => :build
   depends_on 'cups' # R
diff --git a/packages/signal_desktop.rb b/packages/signal_desktop.rb
index 880db5164..96c6c936c 100644
--- a/packages/signal_desktop.rb
+++ b/packages/signal_desktop.rb
@@ -11,7 +11,7 @@ class Signal_desktop < Package
 
   no_compile_needed
 
-  depends_on 'at_spi2_atk'
+  depends_on 'at_spi2_core'
   depends_on 'gtk3'
   depends_on 'sommelier'
 
diff --git a/packages/transmission.rb b/packages/transmission.rb
index 52a05acdb..7b101c608 100644
--- a/packages/transmission.rb
+++ b/packages/transmission.rb
@@ -20,7 +20,7 @@ class Transmission < Package
      x86_64: 'e0892a64138e17054f34b4acdda32f37aee610eed50ad3a7f4da12d71b0bae46'
   })
 
-  depends_on 'atk'
+  depends_on 'at_spi2_core'
   depends_on 'cairo'
   depends_on 'freetype' => :build
   depends_on 'gdk_pixbuf'
diff --git a/packages/vte.rb b/packages/vte.rb
index 694c1a55c..66a28d08e 100644
--- a/packages/vte.rb
+++ b/packages/vte.rb
@@ -27,7 +27,7 @@ class Vte < Package
   depends_on 'fribidi'
   depends_on 'gtk3'
   depends_on 'gtk4'
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'gcc' # R
   depends_on 'gdk_pixbuf' # R
   depends_on 'glib' # R
diff --git a/packages/webkit2gtk_4.rb b/packages/webkit2gtk_4.rb
index 310ecbb19..b938a1efe 100644
--- a/packages/webkit2gtk_4.rb
+++ b/packages/webkit2gtk_4.rb
@@ -20,7 +20,7 @@ class Webkit2gtk_4 < Package
      x86_64: 'c0c4576b995d44de7df7bc8cc4bc416227594a2724a0cf67a27c8be1b222e1f7'
   })
 
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'at_spi2_core' # R
   depends_on 'cairo'
   # depends_on 'ccache' => :build
diff --git a/packages/webkit2gtk_4_1.rb b/packages/webkit2gtk_4_1.rb
index 60cc69c45..feb3350e7 100644
--- a/packages/webkit2gtk_4_1.rb
+++ b/packages/webkit2gtk_4_1.rb
@@ -20,7 +20,7 @@ class Webkit2gtk_4_1 < Package
      x86_64: '915161e70db53e313b65f234733a5bda433e0fd192672062a1c737e7a345e2f4'
   })
 
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'at_spi2_core' # R
   depends_on 'cairo'
   # depends_on 'ccache' => :build
diff --git a/packages/webkit2gtk_5.rb b/packages/webkit2gtk_5.rb
index 8ae130930..10d3bd172 100644
--- a/packages/webkit2gtk_5.rb
+++ b/packages/webkit2gtk_5.rb
@@ -20,7 +20,7 @@ class Webkit2gtk_5 < Package
      x86_64: 'f9c74f727f3d98063e4e0f0f2921e702377f304b1d9c6ab8905ae267f13e1b92'
   })
 
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'at_spi2_core' # R
   depends_on 'cairo'
   # depends_on 'ccache' => :build
diff --git a/packages/wxwidgets.rb b/packages/wxwidgets.rb
index 39760f599..4c8787c76 100644
--- a/packages/wxwidgets.rb
+++ b/packages/wxwidgets.rb
@@ -23,7 +23,7 @@ class Wxwidgets < Package
      x86_64: 'e486f35a49cbb077ecc4b0718b52f0473208fb4edb75de7f35e204db7b9aa23a'
   })
 
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'fontconfig'
   depends_on 'gdk_pixbuf' # R
   depends_on 'glib' # R
diff --git a/packages/wxwidgets30.rb b/packages/wxwidgets30.rb
index 158932a22..7290a92f8 100644
--- a/packages/wxwidgets30.rb
+++ b/packages/wxwidgets30.rb
@@ -23,7 +23,7 @@ class Wxwidgets30 < Package
      x86_64: '0eb2ecba4109d960ab9c23a51161964b26864aad475f7d2a2bfc63b3b4a1a8da'
   })
 
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'fontconfig'
   depends_on 'gdk_pixbuf' # R
   depends_on 'glib' # R
diff --git a/packages/wxwidgets31.rb b/packages/wxwidgets31.rb
index 69b371982..bb905a9b6 100644
--- a/packages/wxwidgets31.rb
+++ b/packages/wxwidgets31.rb
@@ -27,7 +27,7 @@ class Wxwidgets31 < Package
   # https://gitlab.kitware.com/cmake/cmake/-/issues/24019
   # https://github.com/wxWidgets/wxWidgets/issues/22841
 
-  depends_on 'atk' # R
+  depends_on 'at_spi2_core' # R
   depends_on 'gdk_pixbuf' # R
   depends_on 'glib' # R
   depends_on 'gstreamer' # R
diff --git a/packages/yelp.rb b/packages/yelp.rb
index 63a436189..c1cd4889e 100644
--- a/packages/yelp.rb
+++ b/packages/yelp.rb
@@ -24,7 +24,7 @@ class Yelp < Package
   })
 
   depends_on 'appstream_glib'
-  depends_on 'atk'
+  depends_on 'at_spi2_core'
   depends_on 'cairo'
   depends_on 'gdk_pixbuf'
   depends_on 'glib'