diff --git a/BlueSteel/configure.in b/BlueSteel/configure.in
index ce61b21..9c57dae 100644
--- a/BlueSteel/configure.in
+++ b/BlueSteel/configure.in
@@ -1,6 +1,6 @@
 AC_INIT(etheme-BlueSteel.spec)
 
-AM_INIT_AUTOMAKE(e16-theme-BlueSteel, 0.16.8)
+AM_INIT_AUTOMAKE(e16-theme-BlueSteel, 0.16.8-0.01)
 AM_MAINTAINER_MODE
 
 THEME=BlueSteel
diff --git a/BlueSteel/etheme-BlueSteel.spec b/BlueSteel/etheme-BlueSteel.spec
index 5eff27a..c36354e 100644
--- a/BlueSteel/etheme-BlueSteel.spec
+++ b/BlueSteel/etheme-BlueSteel.spec
@@ -1,10 +1,13 @@
+%define revision 0.01
+%define rev_name -%{revision}
+
 Summary:	Enlightenment theme: BlueSteel
 Name:		e16-theme-BlueSteel
 Version:	0.16.8
-Release:	0.%(date '+%y%m%d')
+Release:	%{revision}%{?_vendorsuffix:.%{_vendorsuffix}}
 License:	BSD
 Group:		User Interface/Desktops
-Source0:	http://prdownloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
+Source0:	http://prdownloads.sourceforge.net/enlightenment/%{name}-%{version}%{rev_name}.tar.gz
 Prefix:		%{_prefix}
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
@@ -18,7 +21,7 @@ The BlueSteel theme for Enlightenment.
 This is part of the Enlightenment distribution.
 
 %prep
-%setup
+%setup -n %{name}-%{version}%{rev_name}
 
 %build
 CFLAGS="${RPM_OPT_FLAGS}"
diff --git a/BrushedMetal-Tigert/configure.in b/BrushedMetal-Tigert/configure.in
index fb1e527..d7292ec 100644
--- a/BrushedMetal-Tigert/configure.in
+++ b/BrushedMetal-Tigert/configure.in
@@ -1,6 +1,6 @@
 AC_INIT(etheme-BrushedMetal-Tigert.spec)
 
-AM_INIT_AUTOMAKE(e16-theme-BrushedMetal-Tigert, 0.16.8)
+AM_INIT_AUTOMAKE(e16-theme-BrushedMetal-Tigert, 0.16.8-0.01)
 AM_MAINTAINER_MODE
 
 THEME=BrushedMetal-Tigert
diff --git a/BrushedMetal-Tigert/etheme-BrushedMetal-Tigert.spec b/BrushedMetal-Tigert/etheme-BrushedMetal-Tigert.spec
index e64363c..7b4737a 100644
--- a/BrushedMetal-Tigert/etheme-BrushedMetal-Tigert.spec
+++ b/BrushedMetal-Tigert/etheme-BrushedMetal-Tigert.spec
@@ -1,10 +1,13 @@
+%define revision 0.01
+%define rev_name -%{revision}
+
 Summary:	Enlightenment theme: BrushedMetal-Tigert
 Name:		e16-theme-BrushedMetal-Tigert
 Version:	0.16.8
-Release:	0.%(date '+%y%m%d')
+Release:	%{revision}%{?_vendorsuffix:.%{_vendorsuffix}}
 License:	BSD
 Group:		User Interface/Desktops
-Source0:	http://prdownloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
+Source0:	http://prdownloads.sourceforge.net/enlightenment/%{name}-%{version}%{rev_name}.tar.gz
 Prefix:		%{_prefix}
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
@@ -18,7 +21,7 @@ The BrushedMetal-Tigert theme for Enlightenment.
 This is part of the Enlightenment distribution.
 
 %prep
-%setup
+%setup -n %{name}-%{version}%{rev_name}
 
 %build
 CFLAGS="${RPM_OPT_FLAGS}"
diff --git a/Ganymede/configure.in b/Ganymede/configure.in
index 80062cc..f5033d1 100644
--- a/Ganymede/configure.in
+++ b/Ganymede/configure.in
@@ -1,6 +1,6 @@
 AC_INIT(etheme-Ganymede.spec)
 
-AM_INIT_AUTOMAKE(e16-theme-Ganymede, 0.16.8)
+AM_INIT_AUTOMAKE(e16-theme-Ganymede, 0.16.8-0.01)
 AM_MAINTAINER_MODE
 
 THEME=Ganymede
diff --git a/Ganymede/etheme-Ganymede.spec b/Ganymede/etheme-Ganymede.spec
index 11264ae..8c1380e 100644
--- a/Ganymede/etheme-Ganymede.spec
+++ b/Ganymede/etheme-Ganymede.spec
@@ -1,10 +1,13 @@
+%define revision 0.01
+%define rev_name -%{revision}
+
 Summary:	Enlightenment theme: Ganymede
 Name:		e16-theme-Ganymede
 Version:	0.16.8
-Release:	0.%(date '+%y%m%d')
+Release:	%{revision}%{?_vendorsuffix:.%{_vendorsuffix}}
 License:	BSD
 Group:		User Interface/Desktops
-Source0:	http://prdownloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
+Source0:	http://prdownloads.sourceforge.net/enlightenment/%{name}-%{version}%{rev_name}.tar.gz
 Prefix:		%{_prefix}
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
@@ -18,7 +21,7 @@ The Ganymede theme for Enlightenment.
 This is part of the Enlightenment distribution.
 
 %prep
-%setup
+%setup -n %{name}-%{version}%{rev_name}
 
 %build
 CFLAGS="${RPM_OPT_FLAGS}"
diff --git a/ShinyMetal/configure.in b/ShinyMetal/configure.in
index 9fecfb0..8d3f41a 100644
--- a/ShinyMetal/configure.in
+++ b/ShinyMetal/configure.in
@@ -1,6 +1,6 @@
 AC_INIT(etheme-ShinyMetal.spec)
 
-AM_INIT_AUTOMAKE(e16-theme-ShinyMetal, 0.16.8)
+AM_INIT_AUTOMAKE(e16-theme-ShinyMetal, 0.16.8-0.01)
 AM_MAINTAINER_MODE
 
 THEME=ShinyMetal
diff --git a/ShinyMetal/etheme-ShinyMetal.spec b/ShinyMetal/etheme-ShinyMetal.spec
index f9e61a9..af9342f 100644
--- a/ShinyMetal/etheme-ShinyMetal.spec
+++ b/ShinyMetal/etheme-ShinyMetal.spec
@@ -1,10 +1,13 @@
+%define revision 0.01
+%define rev_name -%{revision}
+
 Summary:	Enlightenment theme: ShinyMetal
 Name:		e16-theme-ShinyMetal
 Version:	0.16.8
-Release:	0.%(date '+%y%m%d')
+Release:	%{revision}%{?_vendorsuffix:.%{_vendorsuffix}}
 License:	BSD
 Group:		User Interface/Desktops
-Source0:	http://prdownloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
+Source0:	http://prdownloads.sourceforge.net/enlightenment/%{name}-%{version}%{rev_name}.tar.gz
 Prefix:		%{_prefix}
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
@@ -18,7 +21,7 @@ The ShinyMetal theme for Enlightenment.
 This is part of the Enlightenment distribution.
 
 %prep
-%setup
+%setup -n %{name}-%{version}%{rev_name}
 
 %build
 CFLAGS="${RPM_OPT_FLAGS}"
diff --git a/winter/etheme-winter.spec b/winter/etheme-winter.spec
index f813e55..97abe8b 100644
--- a/winter/etheme-winter.spec
+++ b/winter/etheme-winter.spec
@@ -13,7 +13,7 @@ URL:		http://www.enlightenment.org/
 Requires: e16 >= 0.16.8
 
 %description
-The ShinyMetal theme for Enlightenment.
+The winter theme for Enlightenment.
 This is part of the Enlightenment distribution.
 
 %prep
@@ -43,9 +43,3 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
-* Mon May 10 2004 Stuart Children <stuart@terminus.co.uk> - 0.16-0.01
-- Tidy ups.
-- Fix download url.
-- Use License rather than Copyright.
-- Remove Packager to avoid people creating mis-attributed packages.
-