diff --git a/manifest/armv7l/l/libxtst.filelist b/manifest/armv7l/l/libxtst.filelist
index 60dc00684..4d68cd46b 100644
--- a/manifest/armv7l/l/libxtst.filelist
+++ b/manifest/armv7l/l/libxtst.filelist
@@ -1,4 +1,4 @@
-# Total size: 280612
+# Total size: 242139
 /usr/local/include/X11/extensions/XTest.h
 /usr/local/include/X11/extensions/record.h
 /usr/local/lib/libXtst.a
@@ -9,14 +9,14 @@
 /usr/local/lib/pkgconfig/xtst.pc
 /usr/local/share/doc/libXtst/recordlib.xml
 /usr/local/share/doc/libXtst/xtestlib.xml
-/usr/local/share/man/man3/XTestCompareCurrentCursorWithWindow.3.gz
-/usr/local/share/man/man3/XTestCompareCursorWithWindow.3.gz
-/usr/local/share/man/man3/XTestDiscard.3.gz
-/usr/local/share/man/man3/XTestFakeButtonEvent.3.gz
-/usr/local/share/man/man3/XTestFakeKeyEvent.3.gz
-/usr/local/share/man/man3/XTestFakeMotionEvent.3.gz
-/usr/local/share/man/man3/XTestFakeRelativeMotionEvent.3.gz
-/usr/local/share/man/man3/XTestGrabControl.3.gz
-/usr/local/share/man/man3/XTestQueryExtension.3.gz
-/usr/local/share/man/man3/XTestSetGContextOfGC.3.gz
-/usr/local/share/man/man3/XTestSetVisualIDOfVisual.3.gz
+/usr/local/share/man/man3/XTestCompareCurrentCursorWithWindow.3.zst
+/usr/local/share/man/man3/XTestCompareCursorWithWindow.3.zst
+/usr/local/share/man/man3/XTestDiscard.3.zst
+/usr/local/share/man/man3/XTestFakeButtonEvent.3.zst
+/usr/local/share/man/man3/XTestFakeKeyEvent.3.zst
+/usr/local/share/man/man3/XTestFakeMotionEvent.3.zst
+/usr/local/share/man/man3/XTestFakeRelativeMotionEvent.3.zst
+/usr/local/share/man/man3/XTestGrabControl.3.zst
+/usr/local/share/man/man3/XTestQueryExtension.3.zst
+/usr/local/share/man/man3/XTestSetGContextOfGC.3.zst
+/usr/local/share/man/man3/XTestSetVisualIDOfVisual.3.zst
diff --git a/manifest/x86_64/l/libxtst.filelist b/manifest/x86_64/l/libxtst.filelist
index b58646110..de38e023e 100644
--- a/manifest/x86_64/l/libxtst.filelist
+++ b/manifest/x86_64/l/libxtst.filelist
@@ -1,4 +1,4 @@
-# Total size: 300946
+# Total size: 253592
 /usr/local/include/X11/extensions/XTest.h
 /usr/local/include/X11/extensions/record.h
 /usr/local/lib64/libXtst.a
@@ -9,14 +9,14 @@
 /usr/local/lib64/pkgconfig/xtst.pc
 /usr/local/share/doc/libXtst/recordlib.xml
 /usr/local/share/doc/libXtst/xtestlib.xml
-/usr/local/share/man/man3/XTestCompareCurrentCursorWithWindow.3.gz
-/usr/local/share/man/man3/XTestCompareCursorWithWindow.3.gz
-/usr/local/share/man/man3/XTestDiscard.3.gz
-/usr/local/share/man/man3/XTestFakeButtonEvent.3.gz
-/usr/local/share/man/man3/XTestFakeKeyEvent.3.gz
-/usr/local/share/man/man3/XTestFakeMotionEvent.3.gz
-/usr/local/share/man/man3/XTestFakeRelativeMotionEvent.3.gz
-/usr/local/share/man/man3/XTestGrabControl.3.gz
-/usr/local/share/man/man3/XTestQueryExtension.3.gz
-/usr/local/share/man/man3/XTestSetGContextOfGC.3.gz
-/usr/local/share/man/man3/XTestSetVisualIDOfVisual.3.gz
+/usr/local/share/man/man3/XTestCompareCurrentCursorWithWindow.3.zst
+/usr/local/share/man/man3/XTestCompareCursorWithWindow.3.zst
+/usr/local/share/man/man3/XTestDiscard.3.zst
+/usr/local/share/man/man3/XTestFakeButtonEvent.3.zst
+/usr/local/share/man/man3/XTestFakeKeyEvent.3.zst
+/usr/local/share/man/man3/XTestFakeMotionEvent.3.zst
+/usr/local/share/man/man3/XTestFakeRelativeMotionEvent.3.zst
+/usr/local/share/man/man3/XTestGrabControl.3.zst
+/usr/local/share/man/man3/XTestQueryExtension.3.zst
+/usr/local/share/man/man3/XTestSetGContextOfGC.3.zst
+/usr/local/share/man/man3/XTestSetVisualIDOfVisual.3.zst
diff --git a/packages/libxtst.rb b/packages/libxtst.rb
index 9827557ca..7f72f6b83 100644
--- a/packages/libxtst.rb
+++ b/packages/libxtst.rb
@@ -1,36 +1,30 @@
-require 'package'
+require 'buildsystems/autotools'
 
-class Libxtst < Package
+class Libxtst < Autotools
   description 'X.org Xtst Library'
   homepage 'http://t2sde.org/packages/libxtst.html'
-  version '1.2.4'
-  license 'custom'
+  version '1.2.5'
+  license 'x11'
   compatibility 'aarch64 armv7l x86_64'
-  source_url 'https://xorg.freedesktop.org/releases/individual/lib/libXtst-1.2.4.tar.xz'
-  source_sha256 '84f5f30b9254b4ffee14b5b0940e2622153b0d3aed8286a3c5b7eeb340ca33c8'
+  source_url 'https://gitlab.freedesktop.org/xorg/lib/libxtst.git'
+  git_hashtag "libXtst-#{version}"
   binary_compression 'tar.zst'
 
   binary_sha256({
-    aarch64: 'a44455fc4e851f8b7e876e158f4602fb10ab7181aad7813e484005121f31eae4',
-     armv7l: 'a44455fc4e851f8b7e876e158f4602fb10ab7181aad7813e484005121f31eae4',
-     x86_64: '2169135a37e04d3bcb39449423acbf56253a46bfa1bc08d204bf2a781e783c75'
+    aarch64: '8e7bb1ac0b1374f726adb05e82daa4474182e996e591e1dd4297cccdb49299b1',
+     armv7l: '8e7bb1ac0b1374f726adb05e82daa4474182e996e591e1dd4297cccdb49299b1',
+     x86_64: 'baf7a556665c1fd42af7f51d539b62e067addddb62d8806fd527fb56455c2dc7'
   })
 
+  depends_on 'fop' => :build
   depends_on 'glibc' # R
   depends_on 'libx11' # R
   depends_on 'libxext' # R
+  depends_on 'libxfixes' => :build
   depends_on 'libxi' # R
   depends_on 'libxau' # R
   depends_on 'libxcb' # R
   depends_on 'libxdmcp' # R
-
-  def self.build
-    system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh'
-    system "./configure #{CREW_CONFIGURE_OPTIONS}"
-    system 'make'
-  end
-
-  def self.install
-    system "make DESTDIR=#{CREW_DEST_DIR} install"
-  end
+  depends_on 'xmlto' => :build
+  depends_on 'libxslt' => :build
 end