diff --git a/package/x11r7/xapp_xfs/xapp_xfs.mk b/package/x11r7/xapp_xfs/xapp_xfs.mk
index 0907fc3f9c..343a0332c6 100644
--- a/package/x11r7/xapp_xfs/xapp_xfs.mk
+++ b/package/x11r7/xapp_xfs/xapp_xfs.mk
@@ -4,11 +4,13 @@
 #
 ################################################################################
 
-XAPP_XFS_VERSION = 1.1.3
-XAPP_XFS_SOURCE = xfs-$(XAPP_XFS_VERSION).tar.bz2
-XAPP_XFS_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_XFS_VERSION = 1c8459eafc04997751ae3d200d0ec91e43e19b5b
+XAPP_XFS_SITE = git://anongit.freedesktop.org/xorg/app/xfs
 XAPP_XFS_LICENSE = MIT
 XAPP_XFS_LICENSE_FILES = COPYING
-XAPP_XFS_DEPENDENCIES = xlib_libFS xlib_libXfont xproto_fontsproto
+XAPP_XFS_AUTORECONF = YES
+# xfont_font-util is only needed due to autoreconf. When switching
+# back to a tarball release, it can be removed.
+XAPP_XFS_DEPENDENCIES = xfont_font-util xlib_libFS xlib_libXfont xproto_fontsproto
 
 $(eval $(autotools-package))