diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2
index ce61d3c..86a6571 100644
--- a/configuration-tweaks.tar.bz2
+++ b/configuration-tweaks.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f2261ec50c13f51c3f47479758ae0a44e5912e30136a187981bb1492c4605ba4
-size 316
+oid sha256:65ac32a3b776ada3b317d1bb596dd3623499f1b408d598ded05f691a02364562
+size 321
diff --git a/install.inc b/install.inc
index 871980f..31da97a 100644
--- a/install.inc
+++ b/install.inc
@@ -155,8 +155,9 @@ ln -s libndbclient.so.6.0.0 '%buildroot'%_libdir/libndbclient.so.6
 if [ -f '%buildroot'/usr/bin/mysqlaccess.conf ]; then
 	mv '%buildroot'/usr/bin/mysqlaccess.conf '%buildroot'/etc/mysqlaccess.conf
 fi
-mkdir -p '%buildroot'/etc/mysql
-bzip2 -cd '%_sourcedir'/configuration-tweaks.tar.bz2 | tar -C '%buildroot'/etc/mysql -xvf -
+mkdir -p '%buildroot'/etc/my.cnf.d
+rm -rf '%buildroot'/etc/my.cnf.d/*
+bzip2 -cd '%_sourcedir'/configuration-tweaks.tar.bz2 | tar -C '%buildroot'/etc/my.cnf.d -xvf -
 if [ -z "`ls '%buildroot'/usr/share/info/mysql.info*`" ]; then
 	install -D -m 0644 Docs/mysql.info "%buildroot/usr/share/info/mysql.info"
 	gzip -9 "%buildroot/usr/share/info/mysql.info"
@@ -168,3 +169,4 @@ if [ "`ls '%buildroot'%_libdir/mysql/plugin/dialog*.so`" ]; then
 fi
 rm -rf '%buildroot'/usr/share/doc/%{name}-%{version}
 rm -rf '%buildroot'/usr/share/mysql/solaris
+rm -rf '%buildroot'/usr/share/mysql/SELinux
diff --git a/mariadb.changes b/mariadb.changes
index e4fdf53..dad4da5 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jun  5 08:48:42 UTC 2013 - mhrusecky@suse.com
+
+- Moving directory with configuration to upstream default
+  (/etc/mysql -> /etc/my.cnf.d)
+
 -------------------------------------------------------------------
 Wed Jun  5 05:51:45 UTC 2013 - mhrusecky@suse.com
 
diff --git a/mariadb.spec b/mariadb.spec
index 61e5841..cf7161c 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -471,8 +471,8 @@ fi
 %files -f mysql.files
 %defattr(-, root, root)
 %config(noreplace) %attr(0640, root, mysql) /etc/my.cnf
-%dir %attr(0750, root, mysql) /etc/mysql
-%config(noreplace) %attr(0640, root, mysql) /etc/mysql/*
+%dir %attr(0750, root, mysql) /etc/my.cnf.d
+%config(noreplace) %attr(0640, root, mysql) /etc/my.cnf.d/*
 %config /etc/logrotate.d/mysql
 %doc %{_defaultdocdir}/%{name}
 %doc %{_infodir}/mysql.info.*
diff --git a/my.ini b/my.ini
index 070f964..a863018 100644
--- a/my.ini
+++ b/my.ini
@@ -96,4 +96,5 @@ log        = /var/log/mysqld_multi.log
 # user       = mysql
 
 !include_dir /etc/mysql
+!include_dir /etc/my.cnf.d
 
diff --git a/mysql-patches.tar.bz2 b/mysql-patches.tar.bz2
index 9da6a2d..2fcb8f8 100644
--- a/mysql-patches.tar.bz2
+++ b/mysql-patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7935739f70f9e0e29aecbfa9d7a7bc18bf91e63141b1f4493ed0f3406563aaef
-size 11806
+oid sha256:242cbdabafce318f7351fc293fc1ad224c7ecef4392041ba94d42518e9d8ac1a
+size 11793