diff --git a/srcpkgs/enlightenment/patches/sysactions_systemd.patch b/srcpkgs/enlightenment/patches/sysactions_systemd.patch
deleted file mode 100644
index 02638bcf588..00000000000
--- a/srcpkgs/enlightenment/patches/sysactions_systemd.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- data/etc/sysactions.conf.in	2012-10-31 17:28:49.000000000 +0100
-+++ data/etc/sysactions.conf.in.bak	2012-11-27 19:27:15.955334382 +0100
-@@ -43,10 +43,10 @@
- # user and group name can use glob matches (* == all for example) like the
- # shell. as can action names allowed or denied.
-
--action:   halt      /sbin/shutdown -h now
--action:   reboot    /sbin/shutdown -r now
--action:   suspend   @SUSPEND@
--action:   hibernate @HIBERNATE@
-+action:   halt      /usr/bin/systemctl poweroff
-+action:   reboot    /usr/bin/systemctl reboot
-+action:   suspend   /usr/bin/systemctl suspend
-+action:   hibernate /usr/bin/systemctl hibernate
- action:   /bin/mount /bin/mount
- action:   /bin/umount /bin/umount
- action:   /usr/bin/eject /usr/bin/eject
diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template
index f64f5c61181..3f4127829a1 100644
--- a/srcpkgs/enlightenment/template
+++ b/srcpkgs/enlightenment/template
@@ -1,29 +1,23 @@
 # Template file for 'enlightenment'
 pkgname=enlightenment
-version=0.17.5
-revision=2
+_distver=0.18.0
+_patchver=alpha4
+version="${_distver}${_patchver}"
+wrksrc="${pkgname}-${_distver}-${_patchver}"
+revision=1
 build_style=gnu-configure
-configure_args="--disable-static --enable-pam --disable-device-hal
- --enable-device-udev --disable-mount-hal --enable-mount-udisks
- --enable-mount-eeze --enable-elementary --enable-emotion
- --enable-enotify --disable-wayland-clients --disable-doc"
+hostmakedepends="pkg-config"
+makedepends="efl-devel>=1.8.1 elementary-devel>=1.8.0 hicolor-icon-theme desktop-file-utils"
 homepage="http://enlightenment.org"
-short_desc="Enlightenment window manager DR17 (aka e17)"
+short_desc="Enlightenment desktop"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
-distfiles="http://download.enlightenment.org/releases/${pkgname}-${version}.tar.bz2"
-checksum=136bfe69ee8d2c885b393a8fc7d6d7378cbcd3da68c459bef1ee54b24d6bf9b5
-
-hostmakedepends="pkg-config"
-makedepends="
- alsa-lib-devel pam-devel e_dbus-devel>=1.7.9_2 edje-devel>=1.7.9
- eeze-devel>=1.7.9  efreet-devel>=1.7.9 elementary-devel>=1.7.9
- evas_generic_loaders>=1.7.9 xcb-util-keysyms-devel hicolor-icon-theme
- desktop-file-utils"
+distfiles="http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${_distver}-${_patchver}.tar.bz2"
+checksum=8a45a0ee7b41e8dd8ade7c87ba304729670bbba79079bbf0febb2f75673511d6
 
 post_install() {
 	# Fix issue #131.
-	sed -e 's,\(Name.*=\).*,\1Enlightenment,g' -i ${DESTDIR}/usr/share/xsessions/enlightenment.desktop
+	#sed -e 's,\(Name.*=\).*,\1Enlightenment,g' -i ${DESTDIR}/usr/share/xsessions/enlightenment.desktop
 
 	vmkdir usr/share/licenses/${pkgname}
 	install -m644 COPYING* ${DESTDIR}/usr/share/licenses/${pkgname}
@@ -32,8 +26,7 @@ post_install() {
 }
 
 enlightenment-devel_package() {
-	depends="efreet-devel ecore-devel edje-devel evas-devel
-		e_dbus-devel ${sourcepkg}>=${version}"
+	depends="efl-devel>=1.8.1 elementary-devel>=1.8.0 ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -44,7 +37,7 @@ enlightenment-devel_package() {
 enlightenment_package() {
 	conf_files="/etc/enlightenment/sysactions.conf"
 	provides="notification-daemon-0_1"
-	depends="hicolor-icon-theme desktop-file-utils evas_generic_loaders>=${version}"
+	depends="hicolor-icon-theme desktop-file-utils evas_generic_loaders>=1.8 emotion_generic_players>=1.8"
 	pkg_install() {
 		vmove all
 	}