diff --git a/community-mysql.spec b/community-mysql.spec
index f659279..1daa0eb 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -83,8 +83,8 @@
 %global sameevr   %{?epoch:%{epoch}:}%{version}-%{release}
 
 Name:             community-mysql
-Version:          5.7.19
-Release:          6%{?with_debug:.debug}%{?dist}
+Version:          5.7.20
+Release:          1%{?with_debug:.debug}%{?dist}
 Summary:          MySQL client programs and shared libraries
 Group:            Applications/Databases
 URL:              http://www.mysql.com
@@ -548,7 +548,6 @@ install -p -m 0644 Docs/INFO_SRC %{buildroot}%{_libdir}/mysql/
 install -p -m 0644 Docs/INFO_BIN %{buildroot}%{_libdir}/mysql/
 
 mkdir -p %{buildroot}%{logfiledir}
-touch %{buildroot}%{logfile}
 
 mkdir -p %{buildroot}%{pidfiledir}
 install -p -m 0755 -d %{buildroot}%{dbdatadir}
@@ -723,7 +722,10 @@ if [ $1 = 1 ]; then
     /sbin/chkconfig --add %{daemon_name}
 fi
 %endif
-/bin/touch %{logfile}
+if [ ! -e "%{logfile}" -a ! -h "%{logfile}" ] ; then
+    install /dev/null -m0640 -omysql -gmysql "%{logfile}"
+fi
+
 
 %preun server
 %if %{with init_systemd}
@@ -852,7 +854,6 @@ fi
 %{_bindir}/mysqld_safe
 %endif
 %{_bindir}/mysqldumpslow
-%{_bindir}/mysqltest
 %{_bindir}/innochecksum
 %{_bindir}/perror
 %{_bindir}/replace
@@ -884,10 +885,14 @@ fi
 %{_mandir}/man1/mysql_tzinfo_to_sql.1*
 %{_mandir}/man1/mysql_upgrade.1*
 %{_mandir}/man1/mysqldumpslow.1*
+%if %{with init_systemd}
+%exclude %{_mandir}/man1/mysqld_multi.1*
+%exclude %{_mandir}/man1/mysqld_safe.1*
+%else
 %{_mandir}/man1/mysqld_multi.1*
 %{_mandir}/man1/mysqld_safe.1*
+%endif
 %{_mandir}/man1/mysqlman.1*
-%{_mandir}/man1/mysqltest.1*
 %{_mandir}/man1/innochecksum.1*
 %{_mandir}/man1/perror.1*
 %{_mandir}/man1/replace.1*
@@ -929,6 +934,7 @@ fi
 %if %{with devel}
 %files devel
 %{_bindir}/mysql_config*
+%exclude %{_bindir}/mysql_config_editor
 %{_includedir}/mysql
 %{_datadir}/aclocal/mysql.m4
 %if %{with clibrary}
@@ -944,22 +950,39 @@ fi
 
 %files embedded-devel
 %{_libdir}/mysql/libmysqld.so
-%{_bindir}/mysql_client_test_embedded
-%{_bindir}/mysqltest_embedded
-%{_mandir}/man1/mysql_client_test_embedded.1*
-%{_mandir}/man1/mysqltest_embedded.1*
 %endif
 
 %if %{with test}
 %files test
 %{_bindir}/mysql_client_test
+%{_bindir}/mysql_client_test_embedded
+%{_bindir}/mysqltest
+%{_bindir}/mysqltest_embedded
 %{_bindir}/mysqlxtest
 %{_bindir}/my_safe_process
 %attr(-,mysql,mysql) %{_datadir}/mysql-test
+%{_mandir}/man1/mysqltest.1*
+%{_mandir}/man1/mysqltest_embedded.1*
 %{_mandir}/man1/mysql_client_test.1*
+%{_mandir}/man1/mysql_client_test_embedded.1*
 %endif
 
 %changelog
+* Wed Oct 25 2017 Michal Schorm <mschorm@redhat.com> - 5.7.20-1
+- Fix owner and perms on log file in post script
+  Related: #1497694
+
+* Mon Oct 16 2017 Norvald H. Ryeng <norvald.ryeng@oracle.com> - 5.7.20-1
+- Update to MySQL 5.7.20, for various fixes described at
+  https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-20.html
+- Move all test binaries to -test package
+- Dont ship unneeded man pages on systemd platforms
+- Remove mysql_config_editor from -devel package, shipped in client
+- CVE fixes: #1503701
+            CVE-2017-10155 CVE-2017-10227 CVE-2017-10268 CVE-2017-10276 CVE-2017-10279
+            CVE-2017-10283 CVE-2017-10286 CVE-2017-10294 CVE-2017-10314 CVE-2017-10378
+            CVE-2017-10379 CVE-2017-10384
+
 * Mon Aug 28 2017 Honza Horak <hhorak@redhat.com> - 5.7.19-6
 - Add bundled(boost) virtual provide
 - Support --defaults-group-suffix option in systemd unit file
diff --git a/sources b/sources
index 485abd6..adb2e3a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mysql-boost-5.7.19.tar.gz) = 4f51be587c5aeb829152ba856b13b800d4f70e538e6f2f484e73d3fa249b90a6ecb27ffd41a8554ad0ed6192a69045e7949102b8248e722da63bd4ee631e395c
+SHA512 (mysql-boost-5.7.20.tar.gz) = 4b80e66ee634d965ea54e815b875150beb19c6bd172d94795d4874df51a93925af48d2cd41cdac5dff1f506ad363418793bcecffa35cd50ee6b8b0d389e54729