diff --git a/.cvsignore b/.cvsignore
index 9a61071..c7edbfc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-wordpress-2.1.3.tar.gz
+wordpress-2.2.1.tar.gz
diff --git a/README.fedora.wordpress b/README.fedora.wordpress
index 8a4518d..469b6e0 100644
--- a/README.fedora.wordpress
+++ b/README.fedora.wordpress
@@ -1,6 +1,9 @@
 Wordpress is a database driven blogging program designed to make it exceedingly
 easy to publish an online blog, sometimes also called a weblog or journal.
 
+
+CONFIGURING WORDPRESS FOR THE FIRST TIME
+----------------------------------------
 Once this package is installed, there are a few configuration items which need
 to be performed before the blog is usable.  First, you need to establish a
 username and password to connect to your MySQL database as, and make both
@@ -43,3 +46,28 @@ Once that's done and the database server and web server have been started,
 open a web browser to http://localhost/wordpress/wp-admin/install.php and 
 follow the instructions given to you on the pages you see to set up the 
 database tables and begin publishing your blog.
+
+
+UPGRADING WORDPRESS
+-------------------
+In order to upgrade from a 2.1 series package, there are several steps you
+will need to take.  If you've already performed the 'yum update', all is not 
+lost, and you more than likely still be able to complete the upgrade
+painlessly.
+
+First, you will want to back up your entire database.  This is simply common
+sense, but it is also mentioned explicitly in Wordpress's upgrade instructions.
+
+You should have disabled all your plugins.  Having old plugins still active
+could cause problems, as the old plugins may not be compatible with the new
+version of Wordpress.
+
+Once all the plugins are disabled, run the actual yum update.  Once this
+completes, you should point a browser at 
+http://<your wordpress host>/wordpress/wp-admin/upgrade.php and follow the
+instructions that appear in the browser window.  Once this is completed, you 
+can begin reactivating plugins one at a time.
+
+If you need a more detailed upgrade document, or you run into problems, please
+see the Wordpress upgrade documentation at 
+http://codex.wordpress.org/Upgrading_WordPress#Detailed_Instructions
diff --git a/sources b/sources
index 4a2a426..f815815 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d480bcaff18c4751eda572be878ef7bc  wordpress-2.1.3.tar.gz
+a2670e28b2ebfe165278ce03ff75fa06  wordpress-2.2.1.tar.gz
diff --git a/wordpress.spec b/wordpress.spec
index e05b496..5097632 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -1,7 +1,7 @@
 Summary: WordPress blogging software
 URL: http://www.wordpress.org
 Name: wordpress
-Version: 2.1.3
+Version: 2.2.1
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: GPL
@@ -12,7 +12,7 @@ Source0: http://wordpress.org/%{name}-%{version}.tar.gz
 Source1: wordpress-httpd-conf
 Source2: README.fedora.wordpress
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: php >= 4.1.0, httpd, php-mysql
+Requires: php >= 4.2.0, httpd, php-mysql
 BuildArch: noarch
 
 %description
@@ -50,6 +50,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc license.txt
 %doc readme.html
 %doc README.fedora
+%{_datadir}/wordpress/wp-app.php
 %{_datadir}/wordpress/wp-atom.php
 %{_datadir}/wordpress/wp-blog-header.php
 %{_datadir}/wordpress/wp-comments-post.php
@@ -73,7 +74,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %dir %{_sysconfdir}/wordpress
 
 %changelog
-* Mon Apr 16 2007 john Berninger <jwb at redhat dot com> - 2.1.3-1
+* Wed Jul  4 2007 John Berninger <john at ncphotography dot com> - 2.2.1-1
+- update to upstream 2.2.1 to fix various vulnerabilities
+
+* Mon Apr 16 2007 John Berninger <jwb at redhat dot com> - 2.1.3-1
 - update to 2.1.3 final - bz235912
 
 * Mon Mar 26 2007 John Berninger <jwb at redhat dot com> - 2.1.3-rc2
@@ -83,16 +87,22 @@ rm -rf ${RPM_BUILD_ROOT}
 - update to 2.1.2 - backdoor exploit introduced upstream in 2.1.1 - bz 230825
 
 * Tue Feb 27 2007 John Berninger <jwb at redhat dot com> - 2.1.1-0
-- update to 2.1.1 to fix vuln in bz 229991
+- update to 2.1.1 for vuln fix - bz 229991
 
 * Wed Jan 31 2007 John Berninger <jwb at redhat dot com> - 2.1-0
-- update to v2.1 to fix multiple bz/vuln's
+- update to v 2.1 to fix multiple bz/vuln's
 
-* Sun Dec  3 2006 John Berninger <jwb at redhat dot com> - 2.0.5-2
+* Wed Dec 27 2006 John Berninger <jwb at redhat dot com> - 2.0.5-1
+- ver 2.0.5 to fix bz 220818
+
+* Sun Dec  3 2006 John Berninger <jwb at redhat dot com> - 2.0.4-4
+- Remove mysql-server dependency for real this time.
+
+* Sun Dec  3 2006 John Berninger <jwb at redhat dot com> - 2.0.4-3
 - Remove mysql-server dependency
 
-* Sun Dec  3 2006 John Berninger <jwb at redhat dot com> - 2.0.5-1
-- Update to upstream 2.0.5 to fix vuln in bz 213985
+* Sun Dec  3 2006 John Berninger <jwb at redhat dot com> - 2.0.4-2
+- Fix wp-db-backup.php vuln in BZ 213985
 
 * Thu Oct 26 2006 John Berninger <jwb at redhat dot com> - 2.0.4-1
 - Doc fix for BZ 207822