diff --git a/dependencies/build-depends.db b/dependencies/build-depends.db
index 1aaba49cde4..586dc380b88 100644
Binary files a/dependencies/build-depends.db and b/dependencies/build-depends.db differ
diff --git a/templates/xorg-server.tmpl b/templates/xorg-server.tmpl
index c7082826686..7a35d3ffac4 100755
--- a/templates/xorg-server.tmpl
+++ b/templates/xorg-server.tmpl
@@ -6,7 +6,8 @@ extract_sufx=".tar.bz2"
 url=http://xorg.freedesktop.org/releases/individual/xserver
 build_style=gnu_configure
 configure_args="--with-xkb-path=$PKGFS_MASTERDIR/share/X11/xkb
- --with-xkb-output=$PKGFS_MASTERDIR/var/db/xkb --enable-install-setuid"
+ --with-xkb-output=$PKGFS_MASTERDIR/var/db/xkb --enable-install-setuid
+ --enable-xtrap --enable-multibuffer --enable-fontcache --enable-record"
 make_cmd="$PKGFS_MASTERDIR/bin/gmake"
 make_install_args="SERVER_MISC_CONFIG_PATH=$PKGFS_DESTDIR/$pkgname-$version/lib/xorg"
 pkgconfig_override="xorg-server.pc"