diff --git a/colorz.spec b/colorz.spec
index 019e18f..f2dc044 100644
--- a/colorz.spec
+++ b/colorz.spec
@@ -1,14 +1,18 @@
-Summary: 	Easy color management in Zope
+%define zope_minver 2.7
+
+%define zope_home      %{_libdir}/zope
+%define software_home  %{zope_home}/lib/python
+
 Name: 		Colorz
 Version: 	1.0.0
-Release: 	1
+Release: 	2
+Summary: 	Easy color management in Zope
 URL: 		http://www.zope.org/Members/maxm/productList/colorz
 Source0: 	http://www.mxm.dk/products/commercial/colorz/releases/colorz_zp_package_1_0_0.zip
 License: 	http://www.mxm.dk/licences/commercial
 Group: 		Development/Web Applications
-BuildRoot: 	%{_tmppath}/%{name}-root
-Packager:	Alex Tucker <alex@floop.org.uk>
-Requires:	Zope-webserver
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:	plone
 
 %description
 Automatically generate a color scheme for an entire website from only
@@ -25,32 +29,39 @@
 
 %prep
 %setup -n colorz_zp_package_1_0_0
-
-%build
+# Clean up sources
+find . -type d -name CVS | xargs rm -rf
+find . -type f -name .cvsignore | xargs rm -rf
+find . -type d -name .svn | xargs rm -rf
+find . -type f -name "*~" | xargs rm -rf
+find . -type f -name "*.pyc" | xargs rm -rf
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -m0755 --directory      $RPM_BUILD_ROOT/usr/share/zope/lib/python/Products/Colorz
-install -m0755 --directory      $RPM_BUILD_ROOT/usr/share/zope/lib/python/Products/ColorzSkin
+install -m0755 --directory      $RPM_BUILD_ROOT%{software_home}/Products/Colorz
+install -m0755 --directory      $RPM_BUILD_ROOT%{software_home}/Products/ColorzSkin
 
-cp -Rdp Colorz/*			$RPM_BUILD_ROOT/usr/share/zope/lib/python/Products/Colorz
-cp -Rdp ColorzSkin/*			$RPM_BUILD_ROOT/usr/share/zope/lib/python/Products/ColorzSkin
-
+cp -Rdp Colorz/*		$RPM_BUILD_ROOT%{software_home}/Products/Colorz
+cp -Rdp ColorzSkin/*		$RPM_BUILD_ROOT%{software_home}/Products/ColorzSkin
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-/usr/share/zope/lib/python/Products/Colorz
+%defattr(644,root,root,755)
+%doc CPP_introduction.txt install.txt
+%{software_home}/Products/Colorz
 
 %files skins
-%defattr(-,root,root)
-/usr/share/zope/lib/python/Products/ColorzSkin
+%defattr(644,root,root,755)
+%{software_home}/Products/ColorzSkin
 
 
 %changelog
+* Thu Jan 26 2006 Alex Tucker <alex@floop.org.uk> - 1.0.0-2
+- Updated for new Zope/Plone builds.
+
 * Tue Jun 10 2003 Alex Tucker <alex@floop.org.uk>
 - Initial build