diff --git a/Makefile.am b/Makefile.am
index d4c4e6f..9175c1d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,6 +12,6 @@ MAINTAINERCLEANFILES = Makefile.in ABOUT-NLS INSTALL aclocal.m4 config.guess com
   po/quot.sed po/en@boldquot.header po/boldquot.sed po/Makevars.template po/remove-potcdate.sin po/Makefile.in.in \
   stamp-h.in acconfig.h depcomp
 
-EXTRA_DIST = README AUTHORS COPYING
+EXTRA_DIST = README AUTHORS COPYING enjoy.spec
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-quicklaunch
diff --git a/configure.ac b/configure.ac
index 3be8691..1eab5d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ m4_define([lt_age], v_min)
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 
-AC_INIT([enjoy], [v_ver-alpha], [enlightenment-devel@lists.sourceforge.net])
+AC_INIT([enjoy], [v_ver.alpha], [enlightenment-devel@lists.sourceforge.net])
 AC_PREREQ([2.60])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])
@@ -113,6 +113,7 @@ AM_CONDITIONAL(BUILD_QUICKLAUNCH, test "x${want_quicklaunch}" = "xyes")
 
 AC_OUTPUT([
 Makefile
+enjoy.spec
 src/Makefile
 src/bin/Makefile
 data/Makefile
diff --git a/data/desktop/Makefile.am b/data/desktop/Makefile.am
index 0bbc2ba..4b6461b 100644
--- a/data/desktop/Makefile.am
+++ b/data/desktop/Makefile.am
@@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
 desktopdir = $(datadir)/applications
 desktop_DATA = enjoy.desktop
 
-icondir = $(datadir)/icons
+icondir = $(datadir)/pixmaps
 icon_DATA = enjoy.png
 
 EXTRA_DIST = enjoy.desktop enjoy.png
diff --git a/enjoy.spec.in b/enjoy.spec.in
new file mode 100644
index 0000000..85af0d4
--- /dev/null
+++ b/enjoy.spec.in
@@ -0,0 +1,56 @@
+%define _missing_doc_files_terminate_build 0
+%{!?_rel:%{expand:%%global _rel 0.r%(svnversion | sed 's/[^0-9].*$//' || echo 0000)}}
+
+Summary: Enjoy - Music Player
+Name: @PACKAGE@
+Version: @VERSION@
+Release: %{_rel}
+License: Lesser GPLv3+
+Group: Applications/Multimedia
+Source: %{name}-%{version}.tar.gz
+Packager: %{?_packager:%{_packager}}%{!?_packager:Rui Miguel Seabra <rms@1407.org>}
+Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)}
+Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
+URL: http://www.enlightenment.org/
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Requires: elementary, sqlite > 3.0, e_dbus, emotion, lightmediascanner
+BuildRequires: elementary-devel, sqlite-devel > 3.0, e_dbus-devel, emotion-devel, lightmediascanner-devel
+
+%description
+Enjoy is a music player written using Enlightenment Foundation
+Libraries (EFL) with focus on speed and mobile usability, yet should
+be usable on desktops as well.
+
+Enjoy is modeled around a media database constructed by
+LightMediaScanner, it is not meant to play single files from disk,
+instead it will recursively index directories for music files and then
+list them by artist, album, genre and so on. Playlists are also
+supported, as well as random or filter playlists can be dynamically
+generated.
+
+%prep
+%setup -q
+
+%build
+%{configure} --prefix=%{_prefix}
+%{__make} %{?_smp_mflags} %{?mflags}
+
+%install
+%{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install
+
+%clean
+test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-, root, root)
+%doc AUTHORS COPYING README
+%{_bindir}/enjoy*
+%{_datadir}/applications/enjoy.desktop
+%{_datadir}/enjoy/default.edj
+%{_datadir}/pixmaps/enjoy.png
+%{_libdir}/enjoy_ql.*
+#%{_datadir}/locale/*
+
+%changelog
+* Fri Nov 26 2010 Rui Miguel Silva Seabra <rms@1407.org> 0.1.0
+- Create rpm spec