diff --git a/configure.ac b/configure.ac
index d36c34b..b025102 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,11 @@
 m4_define([pkg_version],  [0.16.8.0.3])
-dnl m4_define([pkg_revision], [0.00])
-m4_define([pkg_ver_rev],  m4_ifdef([pkg_revision], [pkg_version-pkg_revision], [pkg_version]))
+m4_define([pkg_revision], [0.00])
+m4_define([pkg_version],  m4_ifdef([pkg_revision], [pkg_version-pkg_revision], [pkg_version]))
 m4_define([rpm_revision], m4_ifdef([pkg_revision], [pkg_revision], [1]))
 
-AC_INIT(e16-themes, [pkg_ver_rev], [enlightenment-devel@lists.sourceforge.net])
+AC_INIT(e16-themes, [pkg_version], [enlightenment-devel@lists.sourceforge.net])
 AM_INIT_AUTOMAKE([foreign])
 
-AC_DEFINE(E_PKG_VERSION, ["pkg_version"], [Version])
-AC_SUBST(E_PKG_VERSION,  [pkg_version])
 AC_SUBST(E_RPM_REVISION, [rpm_revision])
 
 dnl reasonable guesses for where stuff is installed
diff --git a/e16-themes.spec.in b/e16-themes.spec.in
index be0058d..410f167 100644
--- a/e16-themes.spec.in
+++ b/e16-themes.spec.in
@@ -1,13 +1,10 @@
-%define revision 1
-%define rev_name %{nil}
-
 Summary:	Enlightenment themes: BlueSteel, BrushedMetal-Tigert, Ganymede, ShinyMetal
 Name:		@PACKAGE@
 Version:	@VERSION@
-Release:	%{revision}%{?_vendorsuffix:.%{_vendorsuffix}}
+Release:	@E_RPM_REVISION@%{?_vendorsuffix:.%{_vendorsuffix}}
 License:	BSD
 Group:		User Interface/Desktops
-Source0:	http://prdownloads.sourceforge.net/enlightenment/%{name}-%{version}%{rev_name}.tar.gz
+Source:		http://prdownloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
 Prefix:		%{_prefix}
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
@@ -22,7 +19,7 @@ The BlueSteel, BrushedMetal-Tigert, Ganymede, and ShinyMetal themes for Enlighte
 This is part of the Enlightenment distribution.
 
 %prep
-%setup -n %{name}-%{version}%{rev_name}
+%setup -n %{name}-%{version}
 
 %build
 %{configure} %{?acflags}