diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2
index 4a696ff..7cfd687 100644
--- a/configuration-tweaks.tar.bz2
+++ b/configuration-tweaks.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d6d0f3e672fe0b13c0eaf57a2659dc5da2cc26ceb2a0fca4d272490c7289163
-size 317
+oid sha256:77fca575a40f9e6c846e190b833784db778f188eb36ac01baec17aeb4cff3cba
+size 316
diff --git a/mariadb-10.0.21.tar.gz b/mariadb-10.0.21.tar.gz
deleted file mode 100644
index 62f2b5d..0000000
--- a/mariadb-10.0.21.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4b9a32e15ceadefdb1057a02eb3e0addf702b75aef631a3c9194b832ecfa3545
-size 56216903
diff --git a/mariadb-10.0.22.tar.gz b/mariadb-10.0.22.tar.gz
new file mode 100644
index 0000000..e2cc4ef
--- /dev/null
+++ b/mariadb-10.0.22.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b
+size 56252325
diff --git a/mariadb.changes b/mariadb.changes
index 2ba2395..196feca 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Mon Nov 30 11:38:12 UTC 2015 - kstreitova@suse.com
+
+- update to 10.0.22
+  * Release notes:
+    https://kb.askmonty.org/en/mariadb-10022-release-notes/
+  * Changelog:
+    https://kb.askmonty.org/en/mariadb-10022-changelog/
+  * fixed CVEs:
+    CVE-2015-4802, CVE-2015-4807, CVE-2015-4815, CVE-2015-4826
+    CVE-2015-4830, CVE-2015-4836, CVE-2015-4858, CVE-2015-4861
+    CVE-2015-4870, CVE-2015-4913, CVE-2015-4792
+  * remove the following patches (applied upstream)
+    * mysql-community-server-5.6.12-srv_buf_size.patch
+    * mariadb-10.0.16-header_files_const_warnings.patch
+- add mariadb-10.0.21-mysql-test_main_bootstrap.patch that fix
+  main.bootstrap test (change default charset to utf8 in test
+  result) [bnc#937787]
+- add mariadb-10.0.22-fix_build_denabled_profiling_off.patch to
+  fix compilation with '-DENABLED_PROFILING=OFF' 
+
 -------------------------------------------------------------------
 Fri Aug 28 14:38:45 UTC 2015 - kstreitova@suse.com
 
diff --git a/mariadb.spec b/mariadb.spec
index 9468e39..b349677 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -44,7 +44,7 @@
 %define with_cassandra 0
 %endif
 Name:           mariadb
-Version:        10.0.21
+Version:        10.0.22
 Release:        0
 Summary:        Server part of %{pretty_name}
 License:        SUSE-GPL-2.0-with-FLOSS-exception
@@ -127,8 +127,8 @@ Provides:       %{extra_provides}-debug-version = %{version}
 Obsoletes:      %{extra_provides}-debug-version < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{?systemd_requires}
-# On mariadb we want readline5 and on mysql we use libedit from system
-%if "%{name}" == "mariadb"
+# On mariadb we want readline5 (except for SLE12) and on mysql we use libedit from system
+%if ("%{name}" == "mariadb" ) && ! (( 0%{?suse_version} == 1315 ) && ( ! 0%{?is_opensuse} ))
 BuildRequires:  readline5-devel
 %else
 BuildRequires:  libedit-devel
diff --git a/mysql-patches.tar.bz2 b/mysql-patches.tar.bz2
index 7d91fcc..e18a071 100644
--- a/mysql-patches.tar.bz2
+++ b/mysql-patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7f9e27993a63973a763a8c2ca9d1ec8246b6989547e8352c1a5be7995c64cb37
-size 14773
+oid sha256:1a5c5d9b7fc4f4b9e2cff38abb0dd8123aeae43b28c52ebdd0ad0e142da449f6
+size 13972
diff --git a/series b/series
index ce369f4..6fe8cb6 100644
--- a/series
+++ b/series
@@ -6,10 +6,10 @@ mariadb-5.2.3-cnf.patch
 mysql-community-server-5.5.6-safe-process-in-bin.patch
 mariadb-10.0.17-group.patch
 mariadb-10.0.5-deharcode-libdir.patch
-mysql-community-server-5.6.12-srv_buf_size.patch
-mariadb-10.0.16-header_files_const_warnings.patch
 mariadb-10.0.15-fortify-and-O.patch
 mariadb-10.0.15-logrotate-su.patch
 mariadb-10.0.15-covscan-signexpr.patch
 mariadb-10.0.10-string-overflow.patch
 mariadb-10.0.20-tabxml-bufferoverflowstrncat.patch
+mariadb-10.0.21-mysql-test_main_bootstrap.patch
+mariadb-10.0.22-fix_build_denabled_profiling_off.patch