diff --git a/.gitignore b/.gitignore
index 5879d73..d8676ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /mariadb-10.0.17.tar.gz
 /mariadb-10.0.18.tar.gz
 /mariadb-10.0.19.tar.gz
+/mariadb-10.0.20.tar.gz
diff --git a/mariadb-ssltest.patch b/mariadb-ssltest.patch
index 8405ba5..bb41fd1 100644
--- a/mariadb-ssltest.patch
+++ b/mariadb-ssltest.patch
@@ -34,3 +34,56 @@ diff -up mariadb-10.0.18/mysql-test/t/ssl_timeout.test.ssltest mariadb-10.0.18/m
  SHOW STATUS LIKE 'Ssl_cipher';
  
  # --error CR_SERVER_LOST
+diff -rup mysql-test-orig/t/ssl_8k_key.test mysql-test/t/ssl_8k_key.test
+--- mariadb-10.0.20/mysql-test-orig/t/ssl_8k_key.test	2015-06-23 22:19:52.926707552 -0400
++++ mariadb-10.0.20/mysql-test/t/ssl_8k_key.test	2015-06-23 22:24:28.304261714 -0400
+@@ -5,6 +5,7 @@
+ #
+ # Bug#29784 YaSSL assertion failure when reading 8k key.
+ #
++--replace_result AES128-GCM-SHA256 DHE-RSA-AES256-SHA
+ --exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1
+ 
+ ##  This test file is for testing encrypted communication only, not other
+diff -rup mysql-test-orig/t/ssl_compress.test mysql-test/t/ssl_compress.test
+--- mariadb-10.0.20/mysql-test-orig/t/ssl_compress.test	2015-06-23 22:19:52.912707611 -0400
++++ mariadb-10.0.20/mysql-test/t/ssl_compress.test	2015-06-23 22:22:38.760221667 -0400
+@@ -11,7 +11,7 @@
+ connect (ssl_compress_con,localhost,root,,,,,SSL COMPRESS);
+ 
+ # Check ssl turned on
+---replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA
++--replace_result AES128-GCM-SHA256 DHE-RSA-AES256-SHA
+ SHOW STATUS LIKE 'Ssl_cipher';
+ 
+ # Check compression turned on
+@@ -21,7 +21,7 @@ SHOW STATUS LIKE 'Compression';
+ -- source include/common-tests.inc
+ 
+ # Check ssl turned on
+---replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA
++--replace_result AES128-GCM-SHA256 DHE-RSA-AES256-SHA
+ SHOW STATUS LIKE 'Ssl_cipher';
+ 
+ # Check compression turned on
+diff -rup mysql-test-orig/t/ssl.test mysql-test/t/ssl.test
+--- mariadb-10.0.20/mysql-test-orig/t/ssl.test	2015-06-23 22:19:52.902707654 -0400
++++ mariadb-10.0.20/mysql-test/t/ssl.test	2015-06-23 22:25:26.153282864 -0400
+@@ -11,7 +11,7 @@
+ connect (ssl_con,localhost,root,,,,,SSL);
+ 
+ # Check ssl turned on
+---replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA
++--replace_result AES128-GCM-SHA256 DHE-RSA-AES256-SHA
+ SHOW STATUS LIKE 'Ssl_cipher';
+ 
+ # Check ssl expiration
+@@ -22,7 +22,7 @@ SHOW STATUS LIKE 'Ssl_server_not_after';
+ -- source include/common-tests.inc
+ 
+ # Check ssl turned on
+---replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA
++--replace_result AES128-GCM-SHA256 DHE-RSA-AES256-SHA
+ SHOW STATUS LIKE 'Ssl_cipher';
+ 
+ #
diff --git a/mariadb.spec b/mariadb.spec
index 6d73dfd..05a25d1 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 19
+%global bugfixver 20
 
 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
@@ -1150,6 +1150,9 @@ fi
 %endif
 
 %changelog
+* Tue Jun 23 2015 Honza Horak <hhorak@redhat.com> - 1:10.0.20-1
+- Update to 10.0.20
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:10.0.19-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list
index c3fc748..5f9270b 100644
--- a/rh-skipped-tests-base.list
+++ b/rh-skipped-tests-base.list
@@ -6,10 +6,8 @@ funcs_1.myisam_func_view                     : rhbz#1096787
 main.bigint                                  : rhbz#1096787
 main.dyncol                                  : rhbz#1096787
 main.func_str                                : rhbz#1096787
-main.ssl                                     : rhbz#1096787
-main.ssl_compress                            : rhbz#1096787
+main.ssl_7937                                : rhbz#1096787
 main.ssl_crl_clients                         : rhbz#1096787
-main.ssl_8k_key                              : rhbz#1096787
 perfschema.nesting                           : rhbz#1096787
 perfschema.socket_summary_by_event_name_func : rhbz#1096787
 perfschema.socket_summary_by_instance_func   : rhbz#1096787
diff --git a/sources b/sources
index baedd15..342a03a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aeaf101c688515dc8f73a5250e6c1df9  mariadb-10.0.19.tar.gz
+59d6c00827ad56f2ac76340fece32fc0  mariadb-10.0.20.tar.gz