diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2
index ab1a3f8..8727b0b 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:86e1bfe8b10e10548aa46c47b28d8bf85dcce2d7e65078f6e449d52a2d4f0bd1
-size 311
+oid sha256:6a4e38d09d75f8507118bcb49961094e07fb5c4a2b7b9d44e8ce864371633391
+size 312
diff --git a/install.inc b/install.inc
index f6c2da5..ae97745 100644
--- a/install.inc
+++ b/install.inc
@@ -88,6 +88,7 @@ for i in "${DOCS[@]}"; do
 	install -m 644 "${i}" "${DOCDIR}" || true
 done
 install -m 755 %_sourcedir/rc.mysql-multi %buildroot/etc/init.d/mysql
+sed -i 's|@MYSQLVER@|%{version}|' %buildroot/etc/init.d/mysql
 ln -sf ../../etc/init.d/mysql %buildroot/usr/sbin/rcmysql
 # this is used by the init script
 install -m 755 -d %buildroot/var/run/mysql
diff --git a/mariadb.changes b/mariadb.changes
index de1a95c..d614b8d 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Sep  9 10:37:12 CEST 2013 - mhrusecky@suse.cz
+
+- better version detection
+- drop /etc/mysql dir, use upstream /etc/my.cfn.d only
+
 -------------------------------------------------------------------
 Thu Aug 22 03:04:45 UTC 2013 - crrodriguez@opensuse.org
 
diff --git a/mysql-patches.tar.bz2 b/mysql-patches.tar.bz2
index 38474c7..08436fb 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:d3d3c1953efc32f5010b3dc1ba1eaa3ae1ad12bde4220f24c267ee33ab1bbdce
-size 13333
+oid sha256:3babe0e59c8fdda2a73560f88ab80c159a9d15f691582418b4648d2a9b6e68b6
+size 13330
diff --git a/rc.mysql-multi b/rc.mysql-multi
index 07e1bc7..ab74ee0 100644
--- a/rc.mysql-multi
+++ b/rc.mysql-multi
@@ -334,7 +334,7 @@ else
 			chown -R --no-dereference mysql:mysql "$log_dir"
 		done
 
-		MYSQLVER="`mysqld --no-defaults --version | sed 's|.*Ver\ *\([^\ ]*\)\.[0-9]\+[\-\ ].*|\1|'`"
+		MYSQLVER="`echo @MYSQLVER@ | sed 's|\.[0-9]\+$||'`"
 
 		# We assume a fresh install if the directory $datadir/mysql
 		# does not exist and create the privilege database