diff --git a/srcpkgs/at-spi2-core/at-spi2-core-devel.template b/srcpkgs/at-spi2-core/at-spi2-core-devel.template
index 5636a62d2be..9e587518fd8 100644
--- a/srcpkgs/at-spi2-core/at-spi2-core-devel.template
+++ b/srcpkgs/at-spi2-core/at-spi2-core-devel.template
@@ -8,8 +8,11 @@ long_desc="${long_desc}
 Add_dependency run dbus-devel
 Add_dependency run at-spi2-core ">=${version}"
 
+noarch=yes
+
 do_install() {
-	mkdir -p ${DESTDIR}/usr/{lib,share}
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/share/{gir*,gtk-doc} ${DESTDIR}/usr/share
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove usr/share/gir-1.0 usr/share
+	vmove usr/share/gtk-doc usr/share
 }
diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template
index a9adc6ccc2d..527d1b38480 100644
--- a/srcpkgs/at-spi2-core/template
+++ b/srcpkgs/at-spi2-core/template
@@ -1,11 +1,11 @@
 # Template file for 'at-spi2-core'
 pkgname=at-spi2-core
-version=2.3.92
-distfiles="${GNOME_SITE}/$pkgname/2.3/$pkgname-$version.tar.xz"
+version=2.4.0
+distfiles="${GNOME_SITE}/$pkgname/2.4/$pkgname-$version.tar.xz"
 build_style=gnu-configure
 short_desc="Assistive Technology Service Provider Interface"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=5824e7d4dcf01543dae9800fdeff93bc1b503baa39461566a6e3f32bac6cbf24
+checksum=d9d087efe528b392cb7ee27982798126df6ec8c18d5e30c557c8fcc55022c669
 long_desc="
  This package includes the protocol definitions for the new D-Bus
  at-spi.