diff --git a/.cvsignore b/.cvsignore
index e8cf7c8..08171c3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-wordpress-2.8.3.tar.gz
+wordpress-2.8.4.tar.gz
diff --git a/changeset_r11798.diff b/changeset_r11798.diff
deleted file mode 100644
index 0945215..0000000
--- a/changeset_r11798.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: /branches/2.8/wp-login.php
-===================================================================
---- /branches/2.8/wp-login.php (revision 11514)
-+++ /branches/2.8/wp-login.php (revision 11798)
-@@ -188,5 +188,5 @@
- 	$key = preg_replace('/[^a-z0-9]/i', '', $key);
- 
--	if ( empty( $key ) )
-+	if ( empty( $key ) || is_array( $key ) )
- 		return new WP_Error('invalid_key', __('Invalid key'));
- 
diff --git a/sources b/sources
index 3f42303..dfab4f8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0edfb5145f4b246eed72646355c45ea0  wordpress-2.8.3.tar.gz
+0e8b296d4e2d4189b349f1d0f727bd98  wordpress-2.8.4.tar.gz
diff --git a/wordpress.spec b/wordpress.spec
index ff6ec9d..9a60780 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -1,9 +1,9 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.8.3
+Version: 2.8.4
 Group: Applications/Publishing
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: GPLv2
 Source0: http://wordpress.org/%{name}-%{version}.tar.gz
 Source1: wordpress-httpd-conf
@@ -11,7 +11,6 @@ Source2: README.fedora.wordpress
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: php >= 4.1.0, httpd, php-mysql
 BuildArch: noarch
-Patch0: changeset_r11798.diff
 
 %description
 Wordpress is an online publishing / weblog package that makes it very easy,
@@ -19,10 +18,13 @@ almost trivial, to get information out to people on the web.
 
 %prep
 %setup -q -n wordpress
-%patch0 -p3
 # disable wp_version_check, updates are always installed via rpm
 sed -i -e "s,\(.*\)'wp_version_check'\(.*\),#\1'wp_version_check'\2,g" \
 	wp-includes/update.php
+# disable update_nag() function
+sed -i -e "s,\(.*\)'update_nag'\(.*\),#\1'update_nag'\2,g; \
+	s,\(.*\)\$msg .=\(.*\),\1\$msg .= '';,g;" \
+	wp-admin/includes/update.php
 # fix file encoding
 sed -i -e 's/\r//' license.txt
 
@@ -79,6 +81,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
+* Sun Aug 30 2009 Adrian Reber <adrian@lisas.de> - 2.8.4-1
+- updated to 2.8.4 (security fixes were already available with 2.8.3-2)
+
 * Tue Aug 11 2009 Adrian Reber <adrian@lisas.de> - 2.8.3-2
 - another security update to fix "Remote admin reset password":
   http://lists.grok.org.uk/pipermail/full-disclosure/2009-August/070137.html