diff --git a/legacy/ecore/ecore.spec.in b/legacy/ecore/ecore.spec.in
index bab3df5df0..6f92a25138 100644
--- a/legacy/ecore/ecore.spec.in
+++ b/legacy/ecore/ecore.spec.in
@@ -50,7 +50,7 @@ Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project
 Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
 #BuildSuggests: xorg-x11-devel, XFree86-devel, libX11-devel, c-ares-devel
 BuildRequires: libjpeg-devel, openssl-devel %{?breq_lib_ecore_directfb}
-BuildRequires: curl-devel, evas-devel, eet-devel %{?breq_lib_ecore_sdl}
+BuildRequires: curl-devel, efl-devel %{?breq_lib_ecore_sdl}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -63,7 +63,7 @@ use of the work put into Ecore to make this job easy for applications.
 Summary: Ecore headers and development libraries.
 Group: Development/Libraries
 Requires: %{name} = %{version}
-Requires: curl-devel, openssl-devel, evas-devel, eet-devel
+Requires: curl-devel, openssl-devel, efl-devel
 Requires: ecore-con, ecore-evas, ecore-file, ecore-ipc
 Requires: ecore-x %{?with_lib_ecore_fb:ecore-fb} %{?with_lib_ecore_directfb:ecore-directfb}
 
diff --git a/legacy/edje/edje.spec.in b/legacy/edje/edje.spec.in
index 06b3bc99c3..485f98c9c8 100644
--- a/legacy/edje/edje.spec.in
+++ b/legacy/edje/edje.spec.in
@@ -14,8 +14,8 @@ Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <mej@eterm.or
 Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)}
 Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
 #BuildSuggests: xorg-x11-devel, vim-enhanced
-BuildRequires: eet-devel, embryo-devel, eio-devel, evas-devel, ecore-devel, lua-devel
-Requires:  evas-module_loader_eet, eio
+BuildRequires: efl-devel, eio-devel, ecore-devel, lua-devel
+Requires:  efl, eio
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -38,7 +38,7 @@ configure parts of the display.
 Summary: Edje headers, static libraries, documentation and test programs
 Group: System Environment/Libraries
 Requires: %{name} = %{version}, %{name}-bin = %{version}
-Requires: eet-devel embryo-devel evas-devel ecore-devel lua-devel
+Requires: efl-devel ecore-devel lua-devel
 
 %description devel
 Headers, static libraries, test programs and documentation for Edje
@@ -47,9 +47,7 @@ Headers, static libraries, test programs and documentation for Edje
 Summary: Edje file compiler/decompiler suite
 Group: System Environment/Libraries
 Requires: %{name} = %{version}
-Requires: embryo-bin
-Requires: evas-module_saver_eet, evas-module_loader_png, evas-module_saver_png
-Requires: evas-module_loader_jpeg, evas-module_saver_jpeg, evas-module_engine_buffer
+Requires: efl
 
 %description bin
 Edje file compiler/decompiler suite
@@ -95,6 +93,7 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 %{_bindir}/edje_codegen
 %{_bindir}/edje_decc
 %{_bindir}/edje_recc
+%{_bindir}/edje_pick
 %{_bindir}/edje_player
 %{_bindir}/edje_external_inspector
 %{_bindir}/edje_inspector
diff --git a/legacy/efreet/efreet.spec.in b/legacy/efreet/efreet.spec.in
index 72c8ee9ced..d3957c9b4f 100644
--- a/legacy/efreet/efreet.spec.in
+++ b/legacy/efreet/efreet.spec.in
@@ -57,6 +57,8 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so.*
 %{_libdir}/efreet/
 %{_datadir}/locale/*/LC_MESSAGES/*.mo
+%{_libdir}/*.a
+%{_datadir}/dbus-1/services/org.enlightenment.Efreet.service
 
 %files devel
 %defattr(-, root, root)
diff --git a/legacy/emotion/emotion.spec.in b/legacy/emotion/emotion.spec.in
index c6fa4951d3..4910b0eabb 100644
--- a/legacy/emotion/emotion.spec.in
+++ b/legacy/emotion/emotion.spec.in
@@ -14,7 +14,7 @@ Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project
 Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
 #BuildSuggests: xorg-x11-devel XFree86-devel libX11-devel libxine1-devel xine-lib-devel
 #BuildSuggests: gstreamer-devel gstreamer-plugins-devel gstreamer-plugins-base-devel gstreamer-ffmpeg
-BuildRequires: eet-devel evas-devel edje-devel edje-bin
+BuildRequires: efl-devel edje-devel edje-bin
 BuildRequires: /usr/bin/xine-config
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -25,7 +25,7 @@ Emotion is a Media Library
 Summary: Emotion headers, static libraries, documentation and test programs
 Group: System Environment/Libraries
 Requires: %{name} = %{version}
-Requires: eet-devel evas-devel edje-devel
+Requires: efl-devel edje-devel
 
 %description devel
 Headers, static libraries, test programs and documentation for Emotion