diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index 9cec2bab48..78a3275d6c 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,14 +1,13 @@
 # Template file for 'xen'
 pkgname=xen
-version=4.1.1
-revision=4
+version=4.1.2
 wrksrc=xen-${version}
 distfiles="http://bits.xensource.com/oss-xen/release/$version/xen-$version.tar.gz"
 short_desc="Xen Hypervisor and Utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xen.org"
 license="GPL-2"
-checksum=246289227507466b5da8b2d0da84a5b0e68a392527b16cde38898d0348890f5b
+checksum=7d9c93057cf480d3f1efa792b19285a84fa3c06060ea5c5c453be00887389b0d
 long_desc="
  This package provides the official Xen Hypervisor and related utilities
  for starting/stopping/accessing unprivileged domains (domUs)."
@@ -19,6 +18,16 @@ nostrip=yes
 pycompile_module="xen grub"
 subpackages="xen-devel"
 
+make_dirs="
+/var/run/xenstored	755	root	root
+/var/run/xend/boot	755	root	root
+/var/lib/xenstored	755	root 	root
+/var/lib/xen/xenpaging	755	root	root
+/var/xen/dump		755	root	root
+/var/log/xen		755	root	root
+/var/lock/subsys	755	root	root
+/etc/xen/auto		755	root	root"
+
 conf_files="
 /etc/default/xendomains
 /etc/default/xencommons
@@ -45,10 +54,7 @@ Add_dependency build libXext-devel
 Add_dependency build SDL-devel
 Add_dependency build MesaLib-devel
 Add_dependency build ncurses-devel
-Add_dependency build libgcrypt-devel
-Add_dependency build libuuid-devel
 Add_dependency build liblzma-devel
-Add_dependency build lzo-devel
 Add_dependency build python-devel
 Add_dependency build dev86
 Add_dependency build acpica-utils
@@ -59,8 +65,7 @@ if [ "${XBPS_MACHINE}" = "x86_64" ]; then
 	Add_dependency build gcc-multilib
 fi
 
-do_build()
-{
+do_build() {
 	install -d ${DESTDIR}
 	cd ${DESTDIR} && ln -sf . install
 	if [ "${XBPS_MACHINE}" = "x86_64" ]; then
@@ -70,14 +75,14 @@ do_build()
 	cd ${wrksrc} && make ${makejobs} DISTDIR=${DESTDIR} xen tools
 }
 
-do_install()
-{
+do_install() {
 	if [ "${XBPS_MACHINE}" = "x86_64" ]; then
 		install -d ${DESTDIR}/usr/lib
 		cd ${DESTDIR}/usr && ln -s lib lib64 && cd ${wrksrc}
 	fi
 
 	make DESTDIR=${DESTDIR} install-xen install-tools
+	rm -f ${DESTDIR}/usr/lib/lib
 
 	# Remove unneeded stuff.
 	rm -f ${DESTDIR}/install ${DESTDIR}/usr/lib64
diff --git a/srcpkgs/xen/xen-devel.template b/srcpkgs/xen/xen-devel.template
index 79755be286..7c40cc19ef 100644
--- a/srcpkgs/xen/xen-devel.template
+++ b/srcpkgs/xen/xen-devel.template
@@ -5,24 +5,9 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run python-devel
-Add_dependency run e2fsprogs-devel
-Add_dependency run bzip2-devel
-Add_dependency run xz-devel
-Add_dependency run zlib-devel
-Add_dependency run gnutls-devel
-Add_dependency run libbluetooth-devel
-Add_dependency run pciutils-devel
-Add_dependency run SDL-devel
-Add_dependency run libX11-devel
-Add_dependency run libXext-devel
-Add_dependency run MesaLib-devel
-Add_dependency run ncurses-devel
-Add_dependency run libgcrypt-devel
 Add_dependency run xen
 
-do_install()
-{
+do_install() {
 	vmove usr/include usr
 	vmove "usr/lib/lib*.*a" usr/lib
 }