diff --git a/enlightenment.spec.in b/enlightenment.spec.in
index 91095fc75..96f6856dc 100644
--- a/enlightenment.spec.in
+++ b/enlightenment.spec.in
@@ -10,12 +10,13 @@ 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}}
 Prefix: %{_prefix}
-#BuildSuggests: xorg-x11-devel
-#BuildRequires: XFree86-devel
-#BuildRequires: evas-devel edje-devel ecore-devel eet-devel
-Requires: evas edje edje-bin ecore eet embryo embryo-bin 
-Requires: evas-module_loader_eet evas-module_saver_eet evas-module_loader_png evas-module_saver_png evas-module_loader_jpeg evas-module_saver_jpeg evas-module_engine_software_x11 evas-module_engine_buffer
-Requires: ecore-con ecore-ipc ecore-evas ecore-file ecore-job ecore-txt ecore-x
+#BuildSuggests: xorg-x11-devel, XFree86-devel
+BuildRequires: evas-devel, edje-devel, edje-bin, ecore-devel, eet-devel
+BuildRequires: embryo-devel, embryo-bin
+Requires: evas-module_loader_eet evas-module_saver_eet
+Requires: evas-module_loader_png evas-module_saver_png
+Requires: evas-module_loader_jpeg evas-module_saver_jpeg
+Requires: evas-module_engine_software_x11 evas-module_engine_buffer
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -25,8 +26,7 @@ Enlightenment is a window manager.
 Summary: Development headers for Enlightenment. 
 Group: User Interface/Desktops
 Requires: %{name} = %{version}
-#Requires: XFree86-devel eet-devel
-Requires: evas-devel edje-devel ecore-devel eet-devel embryo-devel
+Requires: evas-devel, edje-devel, ecore-devel, eet-devel, embryo-devel
 
 %description devel
 Development headers for Enlightenment.
@@ -59,26 +59,7 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 %{_bindir}/enlightenment
 %{_bindir}/enlightenment_*
 %{_libdir}/lib*.so.*
-%{_libdir}/%{name}/preload/*.so
-%{_libdir}/%{name}/modules/battery/*/*.so
-%{_libdir}/%{name}/modules/battery/*.png
-%{_libdir}/%{name}/modules/clock/*/*.so
-%{_libdir}/%{name}/modules/clock/*.png
-%{_libdir}/%{name}/modules/cpufreq/*/*.so
-%{_libdir}/%{name}/modules/cpufreq/*.png
-%{_libdir}/%{name}/modules/cpufreq/*/freqset
-%{_libdir}/%{name}/modules/dropshadow/*/*.so
-%{_libdir}/%{name}/modules/dropshadow/*.png
-%{_libdir}/%{name}/modules/ibar/*/*.so
-%{_libdir}/%{name}/modules/ibar/*.png
-%{_libdir}/%{name}/modules/ibox/*/*.so
-%{_libdir}/%{name}/modules/ibox/*.png
-%{_libdir}/%{name}/modules/pager/*/*.so
-%{_libdir}/%{name}/modules/pager/*.png
-%{_libdir}/%{name}/modules/start/*/*.so
-%{_libdir}/%{name}/modules/start/*.png
-%{_libdir}/%{name}/modules/temperature/*/*.so
-%{_libdir}/%{name}/modules/temperature/*.png
+%{_libdir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/locale/*
 %{_datadir}/xsessions/%{name}.desktop