diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2
index 6337976..92acdc3 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:8ec50f340dbc624772923a07c72a66867b26ba2482cb2a9a4fe547e78a1cf89f
+oid sha256:c81b45d232be16f37661209ae30414b9d365b9633fee3101f02f0965faa0f5e4
 size 222
diff --git a/install.inc b/install.inc
index d82cff5..87d6110 100644
--- a/install.inc
+++ b/install.inc
@@ -86,7 +86,7 @@ install -m 660 %{S:14} %buildroot/etc/my.cnf
 for i in "${DOCS[@]}"; do
 	install -m 644 "${i}" "${DOCDIR}" || true
 done
-%if 0%{?suse_version} >= 1210 && 0%{?use_systemd} > 0
+%if 0%{?use_systemd} > 0
 install -D -m 755 %_sourcedir/rc.mysql.systemd '%buildroot'/usr/lib/mysql/rcmysql
 sed -i 's|@MYSQLVER@|%{version}|' '%buildroot'/usr/lib/mysql/rcmysql
 ln -sf service '%buildroot'/usr/sbin/rcmysql
@@ -163,6 +163,14 @@ if [ "`ls '%buildroot'%_libdir/mysql/plugin/dialog*.so 2> /dev/null`" ]; then
 	echo '%%dir %%_libdir/mysql/plugin'        >> mysql-client.files
 	echo '%%_libdir/mysql/plugin/dialog*.so'   >> mysql-client.files
 fi
+if [ %{_defaultdocdir} \!= /usr/share/doc ]; then
 rm -rf '%buildroot'/usr/share/doc/{mysql,mariadb}*
+fi
+if [ %{name} \!= mysql ]; then
+rm -rf '%buildroot'/usr/share/doc/mysql
+fi
+if [ %{name} \!= mariadb ]; then
+rm -rf '%buildroot'/usr/share/doc/mariadb
+fi
 rm -f  '%buildroot'/usr/share/doc/* 2> /dev/null || true
 rm -rf '%buildroot'/usr/share/mysql/{solaris,SELinux}
diff --git a/mariadb.changes b/mariadb.changes
index 3033a8a..ce94234 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Sep 24 08:08:36 UTC 2014 - michal.hrusecky@opensuse.org
+
+- systemd not depending on SUSE version anymore
+- fixing build on distributions with %docdir != %datadir/doc/%name
+
 -------------------------------------------------------------------
 Fri Sep 19 17:41:26 UTC 2014 - michal.hrusecky@opensuse.org
 
diff --git a/mariadb.spec b/mariadb.spec
index d426211..52f31bf 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -541,7 +541,7 @@ fi
 %if %have_info
 %doc %{_infodir}/mysql.info.*
 %endif
-%if 0%{?suse_version} >= 1210 && 0%{?use_systemd} > 0
+%if 0%{?use_systemd} > 0
 %dir /usr/lib/mysql
 /usr/lib/mysql/rcmysql
 /usr/lib/systemd/system/mysql.service