diff --git a/.gitignore b/.gitignore
index d8676ed..2fcbda1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /mariadb-10.0.18.tar.gz
 /mariadb-10.0.19.tar.gz
 /mariadb-10.0.20.tar.gz
+/mariadb-10.0.21.tar.gz
diff --git a/mariadb-covscan-stroverflow.patch b/mariadb-covscan-stroverflow.patch
index 42f373d..078c7c5 100644
--- a/mariadb-covscan-stroverflow.patch
+++ b/mariadb-covscan-stroverflow.patch
@@ -6,9 +6,9 @@ mysql-5.5.31/plugin/semisync/semisync_master.cc:661:parameter_as_source – Note
 
 mysql-5.5.31/plugin/semisync/semisync_master.cc:555:parameter_as_source – Note: This defect has an elevated risk because the source argument is a parameter of the current function.
 
-diff -up mariadb-10.0.15/plugin/semisync/semisync_master.cc.orig mariadb-10.0.15/plugin/semisync/semisync_master.cc
---- mariadb-10.0.15/plugin/semisync/semisync_master.cc.orig	2014-11-27 15:16:59.664855517 +0100
-+++ mariadb-10.0.15/plugin/semisync/semisync_master.cc	2014-11-27 15:16:17.029779375 +0100
+diff -up mariadb-10.0.21/plugin/semisync/semisync_master.cc.orig mariadb-10.0.21/plugin/semisync/semisync_master.cc
+--- mariadb-10.0.21/plugin/semisync/semisync_master.cc.orig	2015-08-05 20:11:31.000000000 +0200
++++ mariadb-10.0.21/plugin/semisync/semisync_master.cc	2015-08-10 17:22:31.700604043 +0200
 @@ -553,7 +553,8 @@ int ReplSemiSyncMaster::reportReplyBinlo
  
    if (need_copy_send_pos)
@@ -42,16 +42,16 @@ diff -up mariadb-10.0.15/plugin/semisync/semisync_master.cc.orig mariadb-10.0.15
 
 mysql-5.5.31/sql/rpl_handler.cc:306:fixed_size_dest – You might overrun the 512 byte fixed-size string "log_info->log_file" by copying "log_file + dirname_length(log_file)" without checking the length. diff -up mysql-5.5.31/sql/rpl_handler.cc.covscan-stroverflow mysql-5.5.31/sql/rpl_handler.cc
 
-diff -up mariadb-10.0.15/sql/rpl_handler.cc.orig mariadb-10.0.15/sql/rpl_handler.cc
---- mariadb-10.0.15/sql/rpl_handler.cc.orig	2014-11-27 15:17:28.000906123 +0100
-+++ mariadb-10.0.15/sql/rpl_handler.cc	2014-11-27 15:16:17.030779377 +0100
-@@ -270,7 +270,8 @@ int Binlog_storage_delegate::after_flush
-     my_pthread_setspecific_ptr(RPL_TRANS_BINLOG_INFO, log_info);
+diff -up mariadb-10.0.21/sql/rpl_handler.cc.orig mariadb-10.0.21/sql/rpl_handler.cc
+--- mariadb-10.0.21/sql/rpl_handler.cc.orig	2015-08-05 20:11:31.000000000 +0200
++++ mariadb-10.0.21/sql/rpl_handler.cc	2015-08-10 17:28:57.093803582 +0200
+@@ -261,7 +261,8 @@ int Binlog_storage_delegate::after_flush
+     thd->semisync_info= log_info;
    }
-     
+ 
 -  strcpy(log_info->log_file, log_file+dirname_length(log_file));
 +  strncpy(log_info->log_file, log_file+dirname_length(log_file), sizeof(log_info->log_file)-1);
 +  log_info->log_file[sizeof(log_info->log_file)-1] = '\0';
    log_info->log_pos = log_pos;
    
-   int ret= 0;
+   FOREACH_OBSERVER(ret, after_flush, false,
diff --git a/mariadb.spec b/mariadb.spec
index 5c2444b..7b3c788 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -113,11 +113,11 @@
 # Make long macros shorter
 %global sameevr   %{epoch}:%{version}-%{release}
 %global compatver 10.0
-%global bugfixver 20
+%global bugfixver 21
 
 Name:             mariadb
 Version:          %{compatver}.%{bugfixver}
-Release:          3%{?with_debug:.debug}%{?dist}
+Release:          1%{?with_debug:.debug}%{?dist}
 Epoch:            1
 
 Summary:          A community developed branch of MySQL
@@ -1151,6 +1151,9 @@ fi
 %endif
 
 %changelog
+* Mon Aug 10 2015 Jakub Dorňák <jdornak@redhat.com> - 1:10.0.21-1
+- Update to 10.0.21
+
 * Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:10.0.20-3
 - Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
 
diff --git a/sources b/sources
index 342a03a..a3c0d36 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-59d6c00827ad56f2ac76340fece32fc0  mariadb-10.0.20.tar.gz
+956561f3798d1fe8dfbe4b665287a87a  mariadb-10.0.21.tar.gz