diff --git a/configure.ac b/configure.ac
index d122ecb..aec4389 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,15 +1,13 @@
 m4_define([pkg_version],  [0.7])
-#m4_define([pkg_revision], [901])
+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([e16keyedit], [pkg_version], [enlightenment-devel@lists.sourceforge.net])
 AM_INIT_AUTOMAKE([foreign])
 
 AC_SUBST(E_RPM_REVISION, [rpm_revision])
 
-AM_CONFIG_HEADER(config.h)
-
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
@@ -43,8 +41,6 @@ AC_PATH_X
 AC_HEADER_STDC
 AC_CHECK_HEADERS(unistd.h)
 
-dnl Checks for typedefs, structures, and compiler characteristics.
-
-dnl Checks for library functions.
-
-AC_OUTPUT(Makefile e16keyedit.spec)
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_FILES(Makefile e16keyedit.spec)
+AC_OUTPUT
diff --git a/e16keyedit.spec.in b/e16keyedit.spec.in
index 1bc9c7f..34972f9 100644
--- a/e16keyedit.spec.in
+++ b/e16keyedit.spec.in
@@ -4,23 +4,23 @@ Version: @VERSION@
 Release: @E_RPM_REVISION@%{?_vendorsuffix:.%{_vendorsuffix}}
 License: BSD-like
 Group: User Interface/Desktops
-Source: %{name}-%{version}.tar.gz
+URL: http://www.enlightenment.org/
+Source: http://prdownloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
 Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <mej@eterm.org>}
-Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:Enlightenment (http://www.enlightenment/org/)}
-Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:any}
-#BuildRequires: /usr/bin/gtk-config
-#BuildSuggests: gtk-devel
+Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)}
+Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
 Prefix: %{_prefix}
-BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root
-Obsoletes: e16-keyedit
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: e16 >= 1.0.1
+Provides: e16-keyedit = %{version}
+Obsoletes: e16-keyedit
 
 %description
 e16keyedit provides a graphical interface for managing keybindings in
 Enlightenment e16.
 
 %prep
-%setup -q 
+%setup -n %{name}-%{version}
 
 %build
 CFLAGS="%{?cflags:%{cflags}}%{!?cflags:$RPM_OPT_FLAGS}"