diff --git a/srcpkgs/mariadb/INSTALL b/srcpkgs/mariadb/INSTALL
index f6506edc7d6..171f3bc4d7e 100644
--- a/srcpkgs/mariadb/INSTALL
+++ b/srcpkgs/mariadb/INSTALL
@@ -2,7 +2,8 @@
 #
 case ${ACTION} in
 post)
-	usr/bin/mysql_install_db --user=mysql --basedir=/usr
+	install -dm0700 var/lib/mysql
+	usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
 	chown -R mysql:mysql var/lib/mysql
 	;;
 esac
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index 3b14b7b8ff5..97349b75c9c 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -1,13 +1,13 @@
 # Template file for 'mariadb'
 pkgname=mariadb
 version=10.0.12
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql
  -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock -DDEFAULT_CHARSET=utf8
  -DDEFAULT_COLLATION=utf8_general_ci -DENABLED_LOCAL_INFILE=ON
  -DINSTALL_INFODIR=share/mysql/docs -DINSTALL_MANDIR=share/man
- -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
+ -DINSTALL_PLUGINDIR=lib/mysql/plugin -DINSTALL_SCRIPTDIR=bin
  -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
  -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
  -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql