diff --git a/cmfcollectorng.spec b/cmfcollectorng.spec
index 8db1d78..b5d9bb7 100644
--- a/cmfcollectorng.spec
+++ b/cmfcollectorng.spec
@@ -1,15 +1,19 @@
-Summary: 	A Zope/CMF-based bug-tracking system
+%define zope_minver 2.7
+
+%define zope_home      %{_libdir}/zope
+%define software_home  %{zope_home}/lib/python
+
 Name: 		CMFCollectorNG
 Version: 	0.20
-Release: 	2
+Release: 	3
+Summary: 	A Zope/CMF-based bug-tracking system
 URL: 		http://www.zope.org/Members/ajung/CMFCollectorNG/Wiki/FrontPage
 Source0: 	http://prdownloads.sourceforge.net/cmfcollectorng/%{name}-%{version}.tar.gz
 Patch:		python-requires.patch
 License: 	ZPL
 Group: 		Development/Web Applications
-BuildRoot: 	%{_tmppath}/%{name}-root
-Packager:	Alex Tucker <alex@floop.org.uk>
-Requires:	Zope-webserver >= 2.5, CMF >= 1.3
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:	plone >= 2.1
 
 %description
 A Zope/CMF-based bug-tracking system.
@@ -17,25 +21,33 @@
 %prep
 %setup -n %{name}
 %patch -p 1
-
-%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
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -m0755 --directory      $RPM_BUILD_ROOT/usr/share/zope/lib/python/Products/%{name}
-
-cp -Rdp *			$RPM_BUILD_ROOT/usr/share/zope/lib/python/Products/%{name}/
-
+mkdir -p $RPM_BUILD_ROOT%{software_home}/Products/CMFCollectorNG
+cp -pr * $RPM_BUILD_ROOT%{software_home}/Products/CMFCollectorNG
+rm -f $RPM_BUILD_ROOT%{software_home}/Products/CMFCollectorNG/INSTALL.txt
+rm -f $RPM_BUILD_ROOT%{software_home}/Products/CMFCollectorNG/LICENSE.txt
+rm -f $RPM_BUILD_ROOT%{software_home}/Products/CMFCollectorNG/MIGRATION.txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-/usr/share/zope/lib/python/Products/%{name}
+%defattr(644,root,root,755)
+%doc INSTALL.txt LICENSE.txt MIGRATION.txt
+%{software_home}/Products/*
 
 %changelog
+* Wed Jan 25 2006 Alex Tucker <alex@ferrari.floop.org.uk> - 0.20-3
+- Updated for new Zope/Plone builds.
+
 * Tue Jun 17 2003 Alex Tucker <alex@floop.org.uk>
 - Patched to fix python dependency