diff --git a/community-mysql.spec b/community-mysql.spec
index 7311e87..82bbd0d 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -14,7 +14,7 @@
 
 Name:             community-mysql
 Version:          5.6.14
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          MySQL client programs and shared libraries
 Group:            Applications/Databases
 URL:              http://www.mysql.com
@@ -753,6 +753,10 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Fri Oct 11 2013 Honza Horak <hhorak@redhat.com> 5.6.14-2
+- Fix my.cnf to not conflict with mariadb
+  Resolves: #1003115
+
 * Wed Oct  9 2013 Honza Horak <hhorak@redhat.com> 5.6.14-1
 - Update to MySQL 5.6.14, for various fixes described at
   https://dev.mysql.com/doc/relnotes/mysql/5.6/en/news-5-6-14.html
diff --git a/my.cnf b/my.cnf
index 1df1f70..ac882ac 100644
--- a/my.cnf
+++ b/my.cnf
@@ -5,13 +5,23 @@ socket=/var/lib/mysql/mysql.sock
 symbolic-links=0
 # Settings user and group are ignored when systemd is used.
 # If you need to run mysqld under a different user or group,
-# customize your systemd unit file for mysqld according to the
+# customize your systemd unit file for mysqld/mariadb according to the
 # instructions in http://fedoraproject.org/wiki/Systemd
 
-[mysqld_safe]
+# Currently, there are mariadb and community-mysql packages in Fedora.
+# This particular config file is included in respective RPMs of both of them,
+# so the following settings are general and will be also used by both of them.
+# Otherwise the RPMs would be in conflict.
+# Settings for particular implementations like MariaDB are then
+# defined in appropriate sections; for MariaDB server in [mariadb] section in
+# /etc/my.cnf.d/server.cnf (part of mariadb-server).
+# It doesn't matter that we set these settings only for [mysqld] here,
+# because they will be read and used in mysqld_safe as well.
 log-error=/var/log/mysqld.log
 pid-file=/var/run/mysqld/mysqld.pid
 
+[mysqld_safe]
+
 #
 # include all files from the config directory
 #