diff --git a/community-mysql.spec b/community-mysql.spec
index f68156e..ef61d9b 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -80,7 +80,7 @@
 
 Name:             community-mysql
 Version:          5.7.18
-Release:          1%{?with_debug:.debug}%{?dist}
+Release:          2%{?with_debug:.debug}%{?dist}
 Summary:          MySQL client programs and shared libraries
 Group:            Applications/Databases
 URL:              http://www.mysql.com
@@ -571,7 +571,7 @@ install -D -p -m 0644 scripts/my.cnf %{buildroot}%{_sysconfdir}/my.cnf
 %if %{with init_systemd}
 install -D -p -m 644 scripts/mysql.service %{buildroot}%{_unitdir}/%{daemon_name}.service
 install -D -p -m 0644 scripts/mysql.tmpfiles.d %{buildroot}%{_tmpfilesdir}/%{daemon_name}.conf
-rm -rf %{buildroot}%{_tmpfilesdir}/mysql.conf
+rm -r %{buildroot}%{_tmpfilesdir}/mysql.conf
 %endif
 
 # install SysV init script
@@ -594,14 +594,14 @@ mv %{buildroot}%{_datadir}/mysql-test/lib/My/SafeProcess/my_safe_process %{build
 ln -s ../../../../../bin/my_safe_process %{buildroot}%{_datadir}/mysql-test/lib/My/SafeProcess/my_safe_process
 
 # not needed in rpm package
-rm -f %{buildroot}%{_bindir}/mysql_embedded
-rm -f %{buildroot}%{_libdir}/mysql/*.a
-rm -f %{buildroot}%{_datadir}/%{pkg_name}/magic
-rm -f %{buildroot}%{_datadir}/%{pkg_name}/mysql.server
-rm -f %{buildroot}%{_datadir}/%{pkg_name}/mysqld_multi.server
-rm -f %{buildroot}%{_mandir}/man1/comp_err.1*
-rm -f %{buildroot}%{_mandir}/man1/mysql-stress-test.pl.1*
-rm -f %{buildroot}%{_mandir}/man1/mysql-test-run.pl.1*
+rm %{buildroot}%{_bindir}/mysql_embedded
+rm %{buildroot}%{_libdir}/mysql/*.a
+rm %{buildroot}%{_datadir}/%{pkg_name}/magic
+rm %{buildroot}%{_datadir}/%{pkg_name}/mysql.server
+rm %{buildroot}%{_datadir}/%{pkg_name}/mysqld_multi.server
+rm %{buildroot}%{_mandir}/man1/comp_err.1*
+rm %{buildroot}%{_mandir}/man1/mysql-stress-test.pl.1*
+rm %{buildroot}%{_mandir}/man1/mysql-test-run.pl.1*
 
 # put logrotate script where it needs to be
 mkdir -p %{buildroot}%{logrotateddir}
@@ -632,30 +632,30 @@ cp -p %{buildroot}%{_mandir}/man1/mysql_client_test.1 %{buildroot}%{_mandir}/man
 
 %if %{without clibrary}
 unlink %{buildroot}%{_libdir}/mysql/libmysqlclient.so
-rm -rf %{buildroot}%{_libdir}/mysql/libmysqlclient*.so.*
-rm -rf %{buildroot}%{_sysconfdir}/ld.so.conf.d
+rm -r %{buildroot}%{_libdir}/mysql/libmysqlclient*.so.*
+rm -r %{buildroot}%{_sysconfdir}/ld.so.conf.d
 %endif
 
 %if %{without embedded}
-rm -f %{buildroot}%{_libdir}/mysql/libmysqld.so*
-rm -f %{buildroot}%{_bindir}/{mysql_client_test_embedded,mysqltest_embedded}
-rm -f %{buildroot}%{_mandir}/man1/{mysql_client_test_embedded,mysqltest_embedded}.1*
+rm %{buildroot}%{_libdir}/mysql/libmysqld.so*
+rm %{buildroot}%{_bindir}/{mysql_client_test_embedded,mysqltest_embedded}
+rm %{buildroot}%{_mandir}/man1/{mysql_client_test_embedded,mysqltest_embedded}.1*
 %endif
 
 %if %{without devel}
-rm -f %{buildroot}%{_bindir}/mysql_config*
-rm -rf %{buildroot}%{_includedir}/mysql
-rm -f %{buildroot}%{_datadir}/aclocal/mysql.m4
-rm -f %{buildroot}%{_libdir}/pkgconfig/mysqlclient.pc
-rm -f %{buildroot}%{_libdir}/mysql/libmysqlclient*.so
-rm -f %{buildroot}%{_mandir}/man1/mysql_config.1*
+rm %{buildroot}%{_bindir}/mysql_config*
+rm -r %{buildroot}%{_includedir}/mysql
+rm %{buildroot}%{_datadir}/aclocal/mysql.m4
+rm %{buildroot}%{_libdir}/pkgconfig/mysqlclient.pc
+rm %{buildroot}%{_libdir}/mysql/libmysqlclient*.so
+rm %{buildroot}%{_mandir}/man1/mysql_config.1*
 %endif
 
 %if %{without client}
-rm -f %{buildroot}%{_bindir}/{mysql,mysql_config_editor,\
+rm %{buildroot}%{_bindir}/{mysql,mysql_config_editor,\
 mysql_plugin,mysqladmin,mysqlbinlog,\
 mysqlcheck,mysqldump,mysqlpump,mysqlimport,mysqlshow,mysqlslap,my_print_defaults}
-rm -f %{buildroot}%{_mandir}/man1/{mysql,mysql_config_editor,\
+rm %{buildroot}%{_mandir}/man1/{mysql,mysql_config_editor,\
 mysql_plugin,mysqladmin,mysqlbinlog,\
 mysqlcheck,mysqldump,mysqlpump,mysqlimport,mysqlshow,mysqlslap,my_print_defaults}.1*
 %endif
@@ -663,24 +663,24 @@ mysqlcheck,mysqldump,mysqlpump,mysqlimport,mysqlshow,mysqlslap,my_print_defaults
 %if %{with config}
 mkdir -p %{buildroot}%{_sysconfdir}/my.cnf.d
 %else
-rm -f %{buildroot}%{_sysconfdir}/my.cnf
+#rm %{buildroot}%{_sysconfdir}/my.cnf
 %endif
 
 %if %{without common}
-rm -rf %{buildroot}%{_datadir}/%{pkg_name}/charsets
+rm -r %{buildroot}%{_datadir}/%{pkg_name}/charsets
 %endif
 
 %if %{without errmsg}
-rm -f %{buildroot}%{_datadir}/%{pkg_name}/errmsg-utf8.txt
-rm -rf %{buildroot}%{_datadir}/%{pkg_name}/{english,bulgarian,czech,danish,dutch,estonian,\
+rm %{buildroot}%{_datadir}/%{pkg_name}/errmsg-utf8.txt
+rm -r %{buildroot}%{_datadir}/%{pkg_name}/{english,bulgarian,czech,danish,dutch,estonian,\
 french,german,greek,hungarian,italian,japanese,korean,norwegian,norwegian-ny,\
 polish,portuguese,romanian,russian,serbian,slovak,spanish,swedish,ukrainian}
 %endif
 
 %if %{without test}
-rm -f %{buildroot}%{_bindir}/{mysql_client_test,mysqlxtest,my_safe_process}
-rm -rf %{buildroot}%{_datadir}/mysql-test
-rm -f %{buildroot}%{_mandir}/man1/mysql_client_test.1*
+rm %{buildroot}%{_bindir}/{mysql_client_test,mysqlxtest,my_safe_process}
+rm -r %{buildroot}%{_datadir}/mysql-test
+rm %{buildroot}%{_mandir}/man1/mysql_client_test.1*
 %endif
 
 %check
@@ -702,7 +702,7 @@ export MTR_BUILD_THREAD=%{__isa_bits}
 %else
   --skip-test-list=%{skiplist}
 %endif
-  rm -rf var/* $(readlink var)
+  rm -r var $(readlink var)
 popd
 popd
 %endif
@@ -967,6 +967,13 @@ fi
 %endif
 
 %changelog
+* Wed Apr 19 2017 Michal Schorm <mschorm@redhat.com> - 5.7.18-2
+- 'force' option for 'rm' removed in specfile
+- CVEs fixed by previous commit, #1443407:
+  CVE-2017-3308 CVE-2017-3309 CVE-2017-3329 CVE-2017-3450
+  CVE-2017-3453 CVE-2017-3456 CVE-2017-3461 CVE-2017-3462
+  CVE-2017-3463 CVE-2017-3464 CVE-2017-3599 CVE-2017-3600
+
 * Mon Apr 03 2017 Norvald H. Ryeng <norvald.ryeng@oracle.com> - 5.7.18-1
 - Update to MySQL 5.7.18, for various fixes described at
   https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-18.html