diff --git a/.gitignore b/.gitignore
index 1656e1d..1f93e75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /mysql-5.6.19.tar.gz
 /mysql-5.6.20.tar.gz
 /mysql-5.6.21.tar.gz
+/mysql-5.6.22.tar.gz
diff --git a/community-mysql-file-contents.patch b/community-mysql-file-contents.patch
index 76afb92..0991d7a 100644
--- a/community-mysql-file-contents.patch
+++ b/community-mysql-file-contents.patch
@@ -6,9 +6,9 @@ to know about this.
 Recommendation they change is at http://bugs.mysql.com/bug.php?id=61425
 
 
-diff -up mysql-5.6.19/mysql-test/t/file_contents.test.file-contents mysql-5.6.19/mysql-test/t/file_contents.test
---- mysql-5.6.19/mysql-test/t/file_contents.test.file-contents	2014-07-25 11:56:12.442153944 +0200
-+++ mysql-5.6.19/mysql-test/t/file_contents.test	2014-07-25 12:00:11.578581702 +0200
+diff -up mysql-5.6.22/mysql-test/t/file_contents.test.file-contents mysql-5.6.22/mysql-test/t/file_contents.test
+--- mysql-5.6.22/mysql-test/t/file_contents.test.file-contents	2014-12-03 15:05:18.629731527 +0100
++++ mysql-5.6.22/mysql-test/t/file_contents.test	2014-12-03 15:09:36.082081039 +0100
 @@ -11,7 +11,7 @@
  --perl
  print "\nChecking 'INFO_SRC' and 'INFO_BIN'\n";
@@ -18,8 +18,8 @@ diff -up mysql-5.6.19/mysql-test/t/file_contents.test.file-contents mysql-5.6.19
    # RPM package
    $dir_docs = $dir_bin;
    $dir_docs =~ s|/lib|/share/doc|;
-@@ -26,7 +26,7 @@ if ($dir_bin =~ m|/usr/|) {
-       $dir_docs = glob "$dir_bin/share/doc/mysql-community-server*";
+@@ -30,7 +30,7 @@ if ($dir_bin =~ m|/usr/|) {
+       }
      }
    }
 -} elsif ($dir_bin =~ m|/usr$|) {
@@ -27,9 +27,9 @@ diff -up mysql-5.6.19/mysql-test/t/file_contents.test.file-contents mysql-5.6.19
    # RPM build during development
    $dir_docs = "$dir_bin/share/doc";
    if(-d "$dir_docs/packages") {
-@@ -39,6 +39,15 @@ if ($dir_bin =~ m|/usr/|) {
-       # If not it might be ULN so try that
-       $dir_docs = glob "$dir_bin/share/doc/mysql-community-server*";
+@@ -47,6 +47,15 @@ if ($dir_bin =~ m|/usr/|) {
+         $dir_docs = glob "$dir_bin/share/mysql/docs";
+       }
      }
 +
 +    # All the above is entirely wacko, because these files are not docs;
diff --git a/community-mysql.spec b/community-mysql.spec
index 114154c..c6f4622 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -64,8 +64,8 @@
 %global sameevr   %{?epoch:%{epoch}:}%{version}-%{release}
 
 Name:             %{pkgname}
-Version:          5.6.21
-Release:          5%{?with_debug:.debug}%{?dist}
+Version:          5.6.22
+Release:          1%{?with_debug:.debug}%{?dist}
 Summary:          MySQL client programs and shared libraries
 Group:            Applications/Databases
 URL:              http://www.mysql.com
@@ -387,13 +387,15 @@ the MySQL sources.
 
 # Modify tests to pass on all archs
 pushd mysql-test
+
 add_test () {
     echo $1 >> %{skiplist}
 }
 
+touch %{skiplist}
+
 # Workaround for upstream bug #http://bugs.mysql.com/56342
 rm -f t/ssl_8k_key-master.opt
-touch %{skiplist}
 
 # Archs without hw performance counter, rh 741325
 %ifarch %{arm} aarch64 sparc64
@@ -924,6 +926,9 @@ fi
 %endif
 
 %changelog
+* Wed Dec  3 2014 Jakub Dorňák <jdornak@redhat.com> - 5.6.22-1
+- Update to MySQL 5.6.22
+
 * Wed Oct 08 2014 Bjorn Munch <bjorn.munch@oracle.com> - 5.6.21-5
 - Fix rhbz #1149986
 
diff --git a/sources b/sources
index 012044f..099af04 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e47c3a70b8d89db3199a349204b2ae4e  mysql-5.6.21.tar.gz
+3985b634294482363f3d87e0d67f2262  mysql-5.6.22.tar.gz