diff --git a/.gitignore b/.gitignore
index 994ce30..7648616 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/mysql-5.5.15-nodocs.tar.gz
+/mysql-5.5.16-nodocs.tar.gz
diff --git a/mysql-disable-test.patch b/mysql-disable-test.patch
index 1d9403e..74b87df 100644
--- a/mysql-disable-test.patch
+++ b/mysql-disable-test.patch
@@ -8,19 +8,19 @@ Still broken in 5.5.14, despite alleged fix.
 Also disable sys_vars.plugin_dir_basic, which is broken because
 mysql-test-run doesn't set the right value of MYSQL_LIBDIR.  Upstream at
 http://bugs.mysql.com/bug.php?id=52223
-Still fails in 5.5.14, even though upstream marked it closed.
+Still fails in 5.5.16, even though upstream marked it closed.
 
 Also disable innodb.innodb, which is showing platform-dependent results
 as of 5.5.9.  Upstream at http://bugs.mysql.com/bug.php?id=60155
 
 
-diff -Naur mysql-5.5.15.orig/mysql-test/t/disabled.def mysql-5.5.15/mysql-test/t/disabled.def
---- mysql-5.5.15.orig/mysql-test/t/disabled.def	2011-07-13 15:09:03.000000000 -0400
-+++ mysql-5.5.15/mysql-test/t/disabled.def	2011-07-29 11:48:39.214514072 -0400
-@@ -16,3 +16,7 @@
- create-big               : Bug#11748731 2010-11-15 mattiasj was not tested
+diff -Naur mysql-5.5.16.orig/mysql-test/t/disabled.def mysql-5.5.16/mysql-test/t/disabled.def
+--- mysql-5.5.16.orig/mysql-test/t/disabled.def	2011-09-09 11:56:40.000000000 -0400
++++ mysql-5.5.16/mysql-test/t/disabled.def	2011-10-16 19:50:10.064578284 -0400
+@@ -17,3 +17,7 @@
  archive-big              : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc
  log_tables-big           : Bug#11756699 2010-11-15 mattiasj report already exists
+ mysql_embedded           : Bug#12561297 2011-05-14 Anitha Dependent on PB2 changes - eventum#41836
 +#
 +outfile_loaddata         : bug#46895 code wrong, expected results wrong too
 +sys_vars.plugin_dir_basic : bug#52223 fails for lib64 library directory
diff --git a/mysql.spec b/mysql.spec
index 87f111c..ea9723f 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,5 +1,5 @@
 Name: mysql
-Version: 5.5.15
+Version: 5.5.16
 Release: 2%{?dist}
 # Update this whenever F15 gets rebased; it must be NVR-greater than F15 pkg.
 # Our convention for the life of F15 is that sysv packages will be numbered
@@ -397,6 +397,7 @@ rm -f ${RPM_BUILD_ROOT}/usr/data/mysql/.empty
 rm -f ${RPM_BUILD_ROOT}/usr/data/test/.empty
 # should move this to /etc/ ?
 rm -f ${RPM_BUILD_ROOT}%{_bindir}/mysqlaccess.conf
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/mysql_embedded
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/*.a
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/binary-configure
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/magic
@@ -545,6 +546,7 @@ fi
 %{_bindir}/mysql_convert_table_format
 %{_bindir}/mysql_fix_extensions
 %{_bindir}/mysql_install_db
+%{_bindir}/mysql_plugin
 %{_bindir}/mysql_secure_installation
 %{_bindir}/mysql_setpermission
 %{_bindir}/mysql_tzinfo_to_sql
@@ -577,6 +579,7 @@ fi
 %{_mandir}/man1/mysql.server.1*
 %{_mandir}/man1/mysql_fix_extensions.1*
 %{_mandir}/man1/mysql_install_db.1*
+%{_mandir}/man1/mysql_plugin.1*
 %{_mandir}/man1/mysql_secure_installation.1*
 %{_mandir}/man1/mysql_upgrade.1*
 %{_mandir}/man1/mysql_zap.1*
@@ -649,6 +652,10 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Sun Oct 16 2011 Tom Lane <tgl@redhat.com> 5.5.16-2
+- Update to MySQL 5.5.16, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.5/en/news-5-5-16.html
+
 * Fri Jul 29 2011 Tom Lane <tgl@redhat.com> 5.5.15-2
 - Update to MySQL 5.5.15, for various fixes described at
   http://dev.mysql.com/doc/refman/5.5/en/news-5-5-15.html
diff --git a/sources b/sources
index cdd2507..f7951be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3a276581349e8112975a12bb3100f67f  mysql-5.5.15-nodocs.tar.gz
+f73cbec75c7d5937964271497c14ee39  mysql-5.5.16-nodocs.tar.gz