diff --git a/templates/xorg-server-devel b/templates/xorg-server-devel
new file mode 120000
index 00000000000..0e680f217e7
--- /dev/null
+++ b/templates/xorg-server-devel
@@ -0,0 +1 @@
+xorg-server
\ No newline at end of file
diff --git a/templates/xorg-server/depends b/templates/xorg-server/depends
new file mode 100644
index 00000000000..d28587ae8cd
--- /dev/null
+++ b/templates/xorg-server/depends
@@ -0,0 +1,2 @@
+abi_depends=1.6.0
+api_depends=${abi_depends}
diff --git a/templates/xorg-server/devel.template b/templates/xorg-server/devel.template
new file mode 100644
index 00000000000..057535d579d
--- /dev/null
+++ b/templates/xorg-server/devel.template
@@ -0,0 +1,25 @@
+# Template file for 'xorg-server-devel'.
+#
+short_desc="${sourcepkg} development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run xorg-server
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mkdir -p ${DESTDIR}/usr/lib/xorg/modules/extensions
+	mkdir -p ${DESTDIR}/usr/lib/xorg/modules/linux
+	mkdir -p ${DESTDIR}/usr/lib/xorg/modules/multimedia
+
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	for dir in modules modules/extensions modules/linux \
+		modules/multimedia; do
+		mv ${SRCPKGDESTDIR}/usr/lib/xorg/${dir}/*.la \
+			${DESTDIR}/usr/lib/xorg/${dir}
+	done
+	mv ${SRCPKGDESTDIR}/usr/share/aclocal ${DESTDIR}/usr/share
+}
diff --git a/templates/xorg-server/template b/templates/xorg-server/template
index 42200c855fe..fb89ddd06e5 100644
--- a/templates/xorg-server/template
+++ b/templates/xorg-server/template
@@ -1,17 +1,70 @@
 # Template build file for 'xorg-server'.
 pkgname=xorg-server
-version=1.5.1
-distfiles="
-http://xorg.freedesktop.org/releases/individual/xserver/$pkgname-$version.tar.bz2"
+sourcepkg=$pkgname
+version=1.6.0
+distfiles="${XORG_SITE}/xserver/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--with-xkb-path=$XBPS_MASTERDIR/share/X11/xkb
- --with-xkb-output=$XBPS_MASTERDIR/var/db/xkb --enable-install-setuid
- --enable-xtrap --enable-multibuffer --enable-fontcache --enable-record"
-make_cmd="$XBPS_MASTERDIR/bin/gmake"
-make_install_args="SERVER_MISC_CONFIG_PATH=$XBPS_DESTDIR/$pkgname-$version/lib/xorg"
-pkgconfig_override="xorg-server.pc"
+configure_args="--enable-xf86bigfont --enable-multibuffer --enable-record
+ --enable-glx-tls --enable-xcalibrate --localstatedir=/var
+ --disable-static -disable-xprint --enable-config-dbus --sysconfdir=/etc/X11
+ --enable-config-hal --enable-xcsecurity --enable-install-setuid
+ --with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb
+ --with-dri-driver-path=/usr/lib/dri"
 short_desc="Modular X11 server from modular X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=07ea0b352b4eead694a8730ea3bab1587a4f02b1
+checksum=81a9a02b621e8a3e0bae1ad1b5dd6706a3fdcdbe766d75e1670ab5b3f0d32812
 long_desc="
  The X.org X11 Server from the modularized source tree of X.org X11."
+
+conf_files="/etc/dbus-1/system.d/xorg-server.conf"
+subpackages="devel"
+
+Add_dependency full glibc
+Add_dependency full openssl
+Add_dependency full dbus
+Add_dependency full hal
+Add_dependency full libX11
+Add_dependency full libdrm
+Add_dependency full libXdmcp
+Add_dependency full libXfont
+Add_dependency full libfontenc
+Add_dependency full libXext
+Add_dependency full libXau
+Add_dependency full libpciaccess
+Add_dependency full libXmu
+Add_dependency full libXrender
+Add_dependency full libXfixes
+Add_dependency full libXi
+Add_dependency full libXaw
+Add_dependency full libXt
+Add_dependency full libXpm
+Add_dependency full libXcomposite
+Add_dependency full libXScrnSaver
+Add_dependency full libXevie
+Add_dependency full libXres
+Add_dependency full libXtst
+Add_dependency full libXxf86dga
+Add_dependency full libdmx
+Add_dependency full libxkbui
+Add_dependency full libxkbfile
+Add_dependency full libXxf86misc
+Add_dependency full libXxf86vm
+Add_dependency full libXv
+Add_dependency full MesaLib
+Add_dependency full pixman
+Add_dependency full xkbcomp
+Add_dependency full xkeyboard-config
+Add_dependency build perl
+Add_dependency build pkg-config
+Add_dependency build flex
+
+pre_configure()
+{
+	# Fix dbus config path
+	sed -i -e 's/\$(sysconfdir)/\/etc/' $wrksrc/config/Makefile.*
+}
+
+post_install()
+{
+	rm -rf ${DESTDIR}/var/log
+}