diff --git a/mariadb-logrotate.patch b/mariadb-logrotate.patch
index f76237d..c9f8b50 100644
--- a/mariadb-logrotate.patch
+++ b/mariadb-logrotate.patch
@@ -14,15 +14,20 @@ Adjust the mysql-log-rotate script in several ways:
 See discussions at RH bugs 799735, 547007
 
 
-diff -Naur mysql-5.5.22.orig/support-files/mysql-log-rotate.sh mysql-5.5.22/support-files/mysql-log-rotate.sh
---- mysql-5.5.22.orig/support-files/mysql-log-rotate.sh	2012-03-02 14:44:46.000000000 -0500
-+++ mysql-5.5.22/support-files/mysql-log-rotate.sh	2012-03-23 22:33:29.092043705 -0400
-@@ -3,7 +3,7 @@
- # in the [safe_mysqld] section as follows:
+diff -up mariadb-5.5.32/support-files/mysql-log-rotate.sh.errlog mariadb-5.5.32/support-files/mysql-log-rotate.sh
+--- mariadb-5.5.32/support-files/mysql-log-rotate.sh.errlog	2013-08-29 14:35:34.839119044 +0200
++++ mariadb-5.5.32/support-files/mysql-log-rotate.sh	2013-08-29 14:38:54.203996083 +0200
+@@ -1,9 +1,9 @@
+ # This logname can be set in /etc/my.cnf
+-# by setting the variable "err-log"
+-# in the [safe_mysqld] section as follows:
++# by setting the variable "log-error"
++# in the [mysqld_safe] section as follows:
  #
- # [safe_mysqld]
+-# [safe_mysqld]
 -# err-log=@localstatedir@/mysqld.log
-+# err-log=/var/log/mysqld.log
++# [mysqld_safe]
++# log-error=/var/log/mariadb/mariadb.log
  #
  # If the root user has a password you have to create a
  # /root/.my.cnf configuration file with the following
@@ -48,7 +53,7 @@ diff -Naur mysql-5.5.22.orig/support-files/mysql-log-rotate.sh mysql-5.5.22/supp
 -}
 +# Then, un-comment the following lines to enable rotation of mysql's log file:
 +
-+#/var/log/mysqld.log {
++#/var/log/mariadb/mariadb.log {
 +#        create 640 mysql mysql
 +#        notifempty
 +#	daily
diff --git a/mariadb.spec b/mariadb.spec
index 2b81f57..67a11e0 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -3,7 +3,7 @@
 
 Name: mariadb
 Version: 5.5.32
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 1
 
 Summary: A community developed branch of MySQL
@@ -330,15 +330,15 @@ cmake . -DBUILD_CONFIG=mysql_release \
 	-DINSTALL_SCRIPTDIR=bin \
 	-DINSTALL_SQLBENCHDIR=share \
 	-DINSTALL_SUPPORTFILESDIR=share/mysql \
-	-DMYSQL_DATADIR="/var/lib/mysql" \
-	-DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
+	-DMYSQL_DATADIR="%{_localstatedir}/lib/mysql" \
+	-DMYSQL_UNIX_ADDR="%{_localstatedir}/lib/mysql/mysql.sock" \
 	-DENABLED_LOCAL_INFILE=ON \
 	-DENABLE_DTRACE=ON \
 	-DWITH_EMBEDDED_SERVER=ON \
 	-DWITH_READLINE=ON \
 	-DWITH_SSL=system \
 	-DWITH_ZLIB=system \
-	-DTMPDIR=/var/tmp \
+	-DTMPDIR=%{_localstatedir}/tmp \
 	-DWITH_MYSQLD_LDFLAGS="-Wl,-z,relro,-z,now"
 
 make %{?_smp_mflags} VERBOSE=1
@@ -428,11 +428,13 @@ chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/mysql_config
 mv ${RPM_BUILD_ROOT}%{_pkgdocdir}/INFO_SRC ${RPM_BUILD_ROOT}%{_libdir}/mysql/
 mv ${RPM_BUILD_ROOT}%{_pkgdocdir}/INFO_BIN ${RPM_BUILD_ROOT}%{_libdir}/mysql/
 
-mkdir -p $RPM_BUILD_ROOT/var/log
-touch $RPM_BUILD_ROOT/var/log/mysqld.log
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/mariadb
+chmod 0750 $RPM_BUILD_ROOT%{_localstatedir}/log/mariadb
+touch $RPM_BUILD_ROOT%{_localstatedir}/log/mariadb/mariadb.log
+ln -s %{_localstatedir}/log/mariadb/mariadb.log $RPM_BUILD_ROOT%{_localstatedir}/log/mysqld.log
 
-mkdir -p $RPM_BUILD_ROOT/var/run/mysqld
-install -m 0755 -d $RPM_BUILD_ROOT/var/lib/mysql
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/mysqld
+install -m 0755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/mysql
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
 install -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/my.cnf
@@ -486,8 +488,8 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/mytop
 
 # put logrotate script where it needs to be
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
-mv ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-log-rotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mysqld
-chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mysqld
+mv ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-log-rotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mariadb
+chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mariadb
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d
 echo "%{_libdir}/mysql" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
@@ -517,7 +519,7 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mysql/solaris/
 
 %pre server
 /usr/sbin/groupadd -g 27 -o -r mysql >/dev/null 2>&1 || :
-/usr/sbin/useradd -M -N -g mysql -o -r -d /var/lib/mysql -s /sbin/nologin \
+/usr/sbin/useradd -M -N -g mysql -o -r -d %{_localstatedir}/lib/mysql -s /sbin/nologin \
 	-c "MariaDB Server" -u 27 mysql >/dev/null 2>&1 || :
 
 # Explicitly enable mysqld if it was enabled in the beggining
@@ -538,8 +540,8 @@ fi
 
 %post server
 %systemd_post mysqld.service
-/bin/chmod 0755 /var/lib/mysql
-/bin/touch /var/log/mysqld.log
+/bin/chmod 0755 %{_localstatedir}/lib/mysql
+/bin/touch %{_localstatedir}/log/mariadb/mariadb.log
 
 %{_sbindir}/update-alternatives --install %{_bindir}/mysqlbug \
 	mysqlbug %{_libdir}/mysql/mysqlbug %{__isa_bits}
@@ -729,10 +731,12 @@ fi
 %{_libexecdir}/mysqld-wait-ready
 
 %{_tmpfilesdir}/%{name}.conf
-%attr(0755,mysql,mysql) %dir /var/run/mysqld
-%attr(0755,mysql,mysql) %dir /var/lib/mysql
-%attr(0640,mysql,mysql) %config(noreplace) %verify(not md5 size mtime) /var/log/mysqld.log
-%config(noreplace) %{_sysconfdir}/logrotate.d/mysqld
+%attr(0755,mysql,mysql) %dir %{_localstatedir}/run/mysqld
+%attr(0755,mysql,mysql) %dir %{_localstatedir}/lib/mysql
+%attr(0750,mysql,mysql) %dir %{_localstatedir}/log/mariadb
+%attr(0640,mysql,mysql) %config(noreplace) %verify(not md5 size mtime) %{_localstatedir}/log/mariadb/mariadb.log
+%attr(0640,mysql,mysql) %config(noreplace) %verify(not md5 size mtime) %{_localstatedir}/log/mysqld.log
+%config(noreplace) %{_sysconfdir}/logrotate.d/mariadb
 
 %files devel
 %{_includedir}/mysql
@@ -763,6 +767,11 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Thu Aug 29 2013 Honza Horak <hhorak@redhat.com> - 1:5.5.32-11
+- Move log file into /var/log/mariadb/mariadb.log
+- Rename logrotate script to mariadb
+- Resolves: #999589
+
 * Wed Aug 14 2013 Rex Dieter <rdieter@fedoraproject.org> 1:5.5.32-10
 - fix alternatives usage
 
diff --git a/my.cnf b/my.cnf
index 1df1f70..2a5311b 100644
--- a/my.cnf
+++ b/my.cnf
@@ -9,7 +9,7 @@ symbolic-links=0
 # instructions in http://fedoraproject.org/wiki/Systemd
 
 [mysqld_safe]
-log-error=/var/log/mysqld.log
+log-error=/var/log/mariadb/mariadb.log
 pid-file=/var/run/mysqld/mysqld.pid
 
 #
diff --git a/mysqld-prepare-db-dir b/mysqld-prepare-db-dir
index f73bc66..8762ab7 100644
--- a/mysqld-prepare-db-dir
+++ b/mysqld-prepare-db-dir
@@ -19,7 +19,7 @@ get_mysql_option(){
 # Defaults here had better match what mysqld_safe will default to
 get_mysql_option mysqld datadir "/var/lib/mysql"
 datadir="$result"
-get_mysql_option mysqld_safe log-error "/var/log/mysqld.log"
+get_mysql_option mysqld_safe log-error "/var/log/mariadb/mariadb.log"
 errlogfile="$result"
 
 # Absorb configuration settings from the specified systemd service file,