diff --git a/configure.ac b/configure.ac
index aec4389..2346ad7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ m4_define([pkg_revision], [000])
 m4_define([pkg_version],  m4_ifdef([pkg_revision], [pkg_version.pkg_revision], [pkg_version]))
 m4_define([rpm_revision], m4_ifdef([pkg_revision], ["0.%(date '+%y%m%d')"], [1]))
 
-AC_INIT([e16keyedit], [pkg_version], [enlightenment-devel@lists.sourceforge.net])
+AC_INIT([e16-keyedit], [pkg_version], [enlightenment-devel@lists.sourceforge.net])
 AM_INIT_AUTOMAKE([foreign])
 
 AC_SUBST(E_RPM_REVISION, [rpm_revision])
@@ -42,5 +42,5 @@ AC_HEADER_STDC
 AC_CHECK_HEADERS(unistd.h)
 
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES(Makefile e16keyedit.spec)
+AC_CONFIG_FILES(Makefile e16-keyedit.spec)
 AC_OUTPUT
diff --git a/e16keyedit.spec.in b/e16-keyedit.spec.in
similarity index 89%
rename from e16keyedit.spec.in
rename to e16-keyedit.spec.in
index 34972f9..a7bfb70 100644
--- a/e16keyedit.spec.in
+++ b/e16-keyedit.spec.in
@@ -12,11 +12,10 @@ Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: e16 >= 1.0.1
-Provides: e16-keyedit = %{version}
-Obsoletes: e16-keyedit
+Obsoletes: e16keyedit
 
 %description
-e16keyedit provides a graphical interface for managing keybindings in
+e16-keyedit provides a graphical interface for managing keybindings in
 Enlightenment e16.
 
 %prep
@@ -39,7 +38,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-, root, root)
 %doc README COPYING AUTHORS ChangeLog 
-%{_bindir}/%{name}
+%{_bindir}/*
 
 %changelog
 * Tue Jul 20 2004 Mezzanine <mezzanine@kainx.org>