diff --git a/CMFPlone-2.0-final.tar.gz b/CMFPlone-2.0-final.tar.gz
deleted file mode 100644
index 3813242..0000000
--- a/CMFPlone-2.0-final.tar.gz
+++ /dev/null
Binary files differ
diff --git a/Plone-2.0.4.tar.gz b/Plone-2.0.4.tar.gz
deleted file mode 100644
index 2f55666..0000000
--- a/Plone-2.0.4.tar.gz
+++ /dev/null
Binary files differ
diff --git a/Plone-2.0.5.tar.gz b/Plone-2.0.5.tar.gz
new file mode 100644
index 0000000..c68f814
--- /dev/null
+++ b/Plone-2.0.5.tar.gz
Binary files differ
diff --git a/cmfplone.spec b/cmfplone.spec
index 1f20849..6c6c372 100644
--- a/cmfplone.spec
+++ b/cmfplone.spec
@@ -1,6 +1,6 @@
 Summary: 	A user friendly and powerful Content Management System
 Name: 		CMFPlone
-Version: 	2.0.4
+Version: 	2.0.5
 Release: 	1
 URL: 		http://plone.org
 Source: 	http://prdownloads.sourceforge.net/plone/Plone-%{version}.tar.gz
@@ -9,7 +9,7 @@
 Group: 		Development/Web Applications
 BuildRoot: 	%{_tmppath}/%{name}-root
 Packager:	Alex Tucker <alex@floop.org.uk>
-Requires:	Zope-webserver >= 2.6.2, CMF >= 1.4.4, DCWorkflow >= 0.5, Formulator >= 1.4.0, CMFActionIcons >= 0.9, CMFQuickInstallerTool >= 1.4, GroupUserFolder >= 2.0, BTreeFolder2 >= 1.0, CMFFormController >= 1.0.1
+Requires:	Zope-webserver >= 2.6.4, CMF >= 1.4.7, DCWorkflow >= 0.5, Formulator >= 1.4.0, CMFActionIcons >= 0.9, CMFQuickInstallerTool >= 1.4, GroupUserFolder = 2.0.1, BTreeFolder2 >= 1.0, CMFFormController >= 1.0.1
 
 %description
 Plone is a user friendly implementation of the Content Management Framework
@@ -69,7 +69,7 @@
 Group:		Development/Web Applications
 License:	GPL
 URL:		http://sf.net/projects/collective
-Version:	1.5.0
+Version:	1.5.1
 %description -n CMFQuickInstallerTool
 CMFQuickInstallerTool is a facility for comfortable activation/deactivation
 of CMF compliant products inside a CMF site.
@@ -102,7 +102,7 @@
 Group:		Development/Web Applications
 License:	ZPL2
 URL:		http://sf.net/projects/collective
-Version:	1.0.3beta
+Version:	1.0.4
 %description -n CMFFormController
 CMFFormController replaces the portal_form form validation mechanism
 from Plone.  It should work just fine in plain CMF as well.
@@ -112,7 +112,8 @@
 Group:		Development/Web Applications
 License:	GPL2
 URL:		http://plone.org/development/i18n/existing-translations
-Version:	1.0rc8
+Version:	1.0
+Serial:		1
 %description -n PlacelessTranslationService
 Full unicode support for multilingual interface and access keys.
 
@@ -134,7 +135,7 @@
 Group:		Development/Web Applications
 License:	ZPL 2
 URL:		http://mjablonski.zope.de/Epoz/releases/
-Version:	0.8.2
+Version:	0.8.5
 Requires:	Zope-webserver >= 2.6.2
 %description -n Epoz
 Epoz allows you to edit Zope-objects with a wysiwyg-editor. No
@@ -154,7 +155,7 @@
 client-side tools.
 
 %prep
-%setup -n Plone-2.0.4
+%setup -n Plone-2.0.5
 %patch -p 1
 %build
 
@@ -231,6 +232,9 @@
 /usr/share/zope/lib/python/Products/ExternalEditor
 
 %changelog
+* Thu Dec  2 2004 Alex Tucker <alex@floop.org.uk> - 2.0.5-1
+- Updated to version 2.0.5
+
 * Fri Nov 12 2004 Alex Tucker <alex@floop.org.uk> - 2.0.4-1
 - Updated to version 2.0.4