diff --git a/common/shlibs b/common/shlibs
index 75fb3f2a656..df79483a545 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1170,34 +1170,6 @@ libpurple-client.so.0 libpurple-2.10.6_1
 libgnt.so.0 libgnt-2.10.6_1
 libvarnishapi.so.1 libvarnishapi-3.0.3_1
 libao.so.4 libao-1.1.0_1
-libeina.so.1 eina-1.7.4_1
-libeet.so.1 eet-1.7.4_1
-libevas.so.1 evas-1.7.4_3
-libecore_x.so.1 ecore-1.7.4_1
-libecore_imf.so.1 ecore-1.7.4_1
-libecore_input.so.1 ecore-1.7.4_1
-libecore_file.so.1 ecore-1.7.4_1
-libecore_con.so.1 ecore-1.7.4_1
-libecore_input_evas.so.1 ecore-1.7.4_1
-libecore_fb.so.1 ecore-1.7.4_1
-libecore_imf_evas.so.1 ecore-1.7.4_1
-libecore_evas.so.1 ecore-1.7.4_1
-libecore_ipc.so.1 ecore-1.7.4_1
-libecore.so.1 ecore-1.7.4_1
-libeio.so.1 eio-1.7.4_1
-libembryo.so.1 embryo-1.7.4_1
-libedje.so.1 edje-1.7.4_1
-libedbus.so.1 e_dbus-1.7.4_1
-libeukit.so.1 e_dbus-1.7.4_1
-libenotify.so.1 e_dbus-1.7.9_2
-libefreet.so.1 efreet-1.7.4_1
-libefreet_mime.so.1 efreet-1.7.4_1
-libefreet_trash.so.1 efreet-1.7.4_1
-libeeze.so.1 eeze-1.7.4_1
-libemotion.so.1 emotion-1.7.4_1
-libethumb.so.1 ethumb-1.7.4_1
-libethumb_client.so.1 ethumb-1.7.4_1
-libelementary.so.1 elementary-1.7.4_1
 libjansson.so.4 jansson-2.4_1
 libleveldb.so.1 leveldb-1.8.0_1
 libcprops.so.15 libcprops-0.1.12_1
@@ -1438,3 +1410,31 @@ libsource-highlight.so.4 libsource-highlight-3.1.7_1
 libvlc.so.5 libvlc-2.1.1_2
 libvlccore.so.7 libvlc-2.1.1_2
 libbtrfs.so.0 libbtrfs-3.12_1
+libecore_audio.so.1 efl-1.8.1_1
+libecore_con.so.1 efl-1.8.1_1
+libecore_evas.so.1 efl-1.8.1_1
+libecore_file.so.1 efl-1.8.1_1
+libecore_imf_evas.so.1 efl-1.8.1_1
+libecore_imf.so.1 efl-1.8.1_1
+libecore_input_evas.so.1 efl-1.8.1_1
+libecore_input.so.1 efl-1.8.1_1
+libecore_ipc.so.1 efl-1.8.1_1
+libecore.so.1 efl-1.8.1_1
+libecore_wayland.so.1 efl-1.8.1_1
+libecore_x.so.1 efl-1.8.1_1
+libedje.so.1 efl-1.8.1_1
+libeet.so.1 efl-1.8.1_1
+libeeze.so.1 efl-1.8.1_1
+libefreet_mime.so.1 efl-1.8.1_1
+libefreet.so.1 efl-1.8.1_1
+libefreet_trash.so.1 efl-1.8.1_1
+libeina.so.1 efl-1.8.1_1
+libeio.so.1 efl-1.8.1_1
+libeldbus.so.1 efl-1.8.1_1
+libembryo.so.1 efl-1.8.1_1
+libemotion.so.1 efl-1.8.1_1
+libeo.so.1 efl-1.8.1_1
+libethumb_client.so.1 efl-1.8.1_1
+libethumb.so.1 efl-1.8.1_1
+libevas.so.1 efl-1.8.1_1
+libelementary.so.1 elementary-1.8.0_1
diff --git a/srcpkgs/efl-devel b/srcpkgs/efl-devel
new file mode 120000
index 00000000000..fb358f5af85
--- /dev/null
+++ b/srcpkgs/efl-devel
@@ -0,0 +1 @@
+efl
\ No newline at end of file
diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
new file mode 100644
index 00000000000..734dc251f10
--- /dev/null
+++ b/srcpkgs/efl/template
@@ -0,0 +1,45 @@
+# Template file for 'efl'
+pkgname=efl
+version=1.8.1
+revision=1
+build_style=gnu-configure
+# XXX needs bullet for ephysics.
+configure_args="--enable-xinput22 --enable-multisense --enable-systemd
+ --enable-image-loader-webp --enable-harfbuzz --with-x11=xcb
+ --enable-wayland --disable-physics --enable-drm"
+hostmakedepends="pkg-config"
+makedepends="openssl-devel systemd-devel glib-devel harfbuzz-devel
+ libjpeg-turbo-devel fontconfig-devel fribidi-devel libXrender-devel libXi-devel
+ giflib-devel libpng-devel tiff-devel libwebp-devel gst-plugins-base-devel
+ alsa-lib-devel pulseaudio-devel libsndfile-devel libXcursor-devel libXcomposite-devel
+ libXinerama-devel xcb-util-devel xcb-util-keysyms-devel xcb-util-image-devel
+ xcb-util-renderutil-devel xcb-util-wm-devel pixman-devel libxkbcommon-devel
+ libmount-devel lua-devel wayland-devel ibus-devel MesaLib-devel"
+homepage="http://enlightenment.org"
+short_desc="Enlightenment Foundation Libraries"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="BSD"
+distfiles="http://download.enlightenment.org/rel/libs/efl/efl-${version}.tar.gz"
+checksum=06c051fb6c028555a28d211cb75432bdfee0178b5e855dee439a57363a156c60
+
+efl-devel_package() {
+	short_desc+=" - development files"
+	depends="efl>=${version}_${revision}"
+	replaces="ecore-devel>=0 evas-devel>=0 edje-devel>=0 eio-devel>=0
+		emotion-devel>=0 e_dbus-devel>=0 eet-devel>=0 eina-devel>=0
+		efreet-devel>=0 embryo-devel>=0 ethumb-devel>=0 eeze-devel>=0"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/cmake
+		vmove usr/lib/pkgconfig
+	}
+}
+
+efl_package() {
+	replaces="ecore>=0 evas>=0 edje>=0 eio>=0 eina>=0 emotion>=0 eeze>=0
+		e_dbus>=0 eet>=0 evas>=0 embryo>=0 efreet>=0 ethumb>=0"
+	pkg_install() {
+		vmove all
+	}
+}