diff --git a/.cvsignore b/.cvsignore
index 20b52f3..10708d1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-phpMyAdmin-3.2.4-all-languages.tar.bz2
+phpMyAdmin-3.2.5-all-languages.tar.bz2
diff --git a/phpMyAdmin-3.2.4-blowfish.patch b/phpMyAdmin-3.2.4-blowfish.patch
deleted file mode 100644
index 8babe90..0000000
--- a/phpMyAdmin-3.2.4-blowfish.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Backport from upstream http://sourceforge.net/tracker/?func=detail&atid=377408&aid=2905629&group_id=23067,
-will be included with phpMyAdmin 3.2.5.
-
---- phpMyAdmin-3.2.4-all-languages/Documentation.html				2009/11/23 17:45:37	13121
-+++ phpMyAdmin-3.2.4-all-languages/Documentation.html.blowfish			2009/11/29 21:36:13	13139
-@@ -626,8 +626,8 @@
-         algorithm to encrypt the password.<br />
-         If you are using the &quot;cookie&quot; auth_type, enter here a random
-         passphrase of your choice. It will be used internally by the blowfish
--        algorithm: you won&#8217;t be prompted for this passphrase. The maximum
--        number of characters for this parameter seems to be 46.<br /><br />
-+        algorithm: you won&#8217;t be prompted for this passphrase. There is
-+        no maximum length for this secret.<br /><br />
-         
-         Since version 3.1.0 phpMyAdmin can generate this on the fly, but it
-         makes a bit weaker security as this generated secret is stored in
---- phpMyAdmin-3.2.4-all-languages/libraries/auth/cookie.auth.lib.php		2009/05/18 14:20:25	12438
-+++ phpMyAdmin-3.2.4-all-languages/libraries/auth/cookie.auth.lib.php.blowfish	2009/11/29 21:36:13	13139
-@@ -95,11 +95,13 @@
- function PMA_get_blowfish_secret() {
-     if (empty($GLOBALS['cfg']['blowfish_secret'])) {
-         if (empty($_SESSION['auto_blowfish_secret'])) {
-+            // this returns 23 characters 
-             $_SESSION['auto_blowfish_secret'] = uniqid('', true);
-         }
-         return $_SESSION['auto_blowfish_secret'];
-     } else {
--        return $GLOBALS['cfg']['blowfish_secret'];
-+        // apply md5() to work around too long secrets (returns 32 characters)
-+        return md5($GLOBALS['cfg']['blowfish_secret']);
-     }
- }
- 
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 47ac1f3..5c89bc7 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 3.2.4
+Version: 3.2.5
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -9,7 +9,6 @@ URL: http://www.phpmyadmin.net/
 Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2
 Source1: phpMyAdmin-config.inc.php
 Source2: phpMyAdmin.htaccess
-Patch0: phpMyAdmin-3.2.4-blowfish.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -29,7 +28,6 @@ is available in 50 languages
 
 %prep
 %setup -qn phpMyAdmin-%{version}-all-languages
-%patch0 -p1
 
 %install
 rm -rf %{buildroot}
@@ -57,6 +55,9 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
+* Sun Jan 10 2010 Robert Scheck <robert@fedoraproject.org> 3.2.5-1
+- Upstream released 3.2.5
+
 * Thu Dec 03 2009 Robert Scheck <robert@fedoraproject.org> 3.2.4-1
 - Upstream released 3.2.4 (#540871, #540891)
 
diff --git a/sources b/sources
index ea0a839..d4cbb11 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b927655abd701d8e35079f9e5ec24ee2  phpMyAdmin-3.2.4-all-languages.tar.bz2
+6083ea867a152f58f5c332d0c9b92ac1  phpMyAdmin-3.2.5-all-languages.tar.bz2