diff --git a/srcpkgs/xorg-server/INSTALL b/srcpkgs/xorg-server/INSTALL
new file mode 100644
index 00000000000..6f0fefe3cff
--- /dev/null
+++ b/srcpkgs/xorg-server/INSTALL
@@ -0,0 +1,7 @@
+#
+# Sets up correct perms to Xorg.
+case "${ACTION}" in
+post)
+	chmod 4755 usr/bin/Xorg || exit $?
+	;;
+esac
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 89873d07932..b27a2fd554b 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,13 +1,13 @@
 # Template build file for 'xorg-server'.
 pkgname=xorg-server
 version=1.8.0
-revision=1
+revision=2
 distfiles="${XORG_SITE}/xserver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--with-dri-driver-path=/usr/lib/dri --enable-ipv6
 --enable-glx-tls --localstatedir=/var --disable-static
 --disable-config-dbus --enable-config-udev --sysconfdir=/etc/X11
---disable-config-hal --enable-install-setuid --enable-secure-rpc
+--disable-config-hal --enable-secure-rpc
 --with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb
 --with-fontrootdir=/usr/share/fonts/X11 --with-sha1=libcrypto
 --disable-dmx --disable-xfree86-utils"