diff --git a/mariadb-install-db-sharedir.patch b/mariadb-install-db-sharedir.patch
index 4949b6d..77a90e7 100644
--- a/mariadb-install-db-sharedir.patch
+++ b/mariadb-install-db-sharedir.patch
@@ -1,21 +1,21 @@
 Use configured value instead of hardcoded path
 
-diff -up mariadb-10.0.13/scripts/mysql_install_db.pl.in.pbasedir mariadb-10.0.13/scripts/mysql_install_db.pl.in
---- mariadb-10.0.13/scripts/mysql_install_db.pl.in.pbasedir	2014-09-04 12:50:24.061979080 +0200
-+++ mariadb-10.0.13/scripts/mysql_install_db.pl.in	2014-09-04 12:51:22.929045559 +0200
-@@ -318,7 +318,7 @@ elsif ( $opt->{basedir} )
+diff -up mariadb-10.1.18/scripts/mysql_install_db.pl.in.pbasedir mariadb-10.1.18/scripts/mysql_install_db.pl.in
+--- mariadb-10.1.18/scripts/mysql_install_db.pl.in.pbasedir	2016-10-04 19:03:15.562101826 +0200
++++ mariadb-10.1.18/scripts/mysql_install_db.pl.in	2016-10-04 19:04:47.833130195 +0200
+@@ -320,7 +320,7 @@ elsif ( $opt->{basedir} )
                      find_in_basedir($opt,"file","mysqld-nt",
                                    "bin");  # ,"sql"
-   $pkgdatadir     = find_in_basedir($opt,"dir","fill_help_tables.sql",
+   $srcpkgdatadir  = find_in_basedir($opt,"dir","fill_help_tables.sql",
 -                                    "share","share/mysql");  # ,"scripts"
 +                                    "share","@INSTALL_MYSQLSHAREDIR@");  # ,"scripts"
+   $buildpkgdir    = $srcpkgdatadir;
    $scriptdir      = "$opt->{basedir}/scripts";
  }
- else
-diff -up mariadb-10.0.13/scripts/mysql_install_db.sh.pbasedir mariadb-10.0.13/scripts/mysql_install_db.sh
---- mariadb-10.0.13/scripts/mysql_install_db.sh.pbasedir	2014-09-04 12:51:59.005086301 +0200
-+++ mariadb-10.0.13/scripts/mysql_install_db.sh	2014-09-04 12:54:02.794222597 +0200
-@@ -280,16 +280,16 @@ then
+diff -up mariadb-10.1.18/scripts/mysql_install_db.sh.pbasedir mariadb-10.1.18/scripts/mysql_install_db.sh
+--- mariadb-10.1.18/scripts/mysql_install_db.sh.pbasedir	2016-10-04 19:03:22.714104025 +0200
++++ mariadb-10.1.18/scripts/mysql_install_db.sh	2016-10-04 19:08:11.457186833 +0200
+@@ -283,17 +283,17 @@ then
      cannot_find_file mysqld $basedir/libexec $basedir/sbin $basedir/bin
      exit 1
    fi
@@ -27,9 +27,10 @@ diff -up mariadb-10.0.13/scripts/mysql_install_db.sh.pbasedir mariadb-10.0.13/sc
 +    cannot_find_file errmsg.sys $basedir/share/english $basedir/@INSTALL_MYSQLSHAREDIR@/english
      exit 1
    fi
--  pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql`
-+  pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share @INSTALL_MYSQLSHAREDIR@`
-   if test -z "$pkgdatadir"
+-  srcpkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql`
++  srcpkgdatadir=`find_in_basedir --dir fill_help_tables.sql share @INSTALL_MYSQLSHAREDIR@`
+   buildpkgdatadir=$srcpkgdatadir
+   if test -z "$srcpkgdatadir"
    then
 -    cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mysql
 +    cannot_find_file fill_help_tables.sql $basedir/share $basedir/@INSTALL_MYSQLSHAREDIR@
diff --git a/mariadb.spec b/mariadb.spec
index d4420ce..8f7b3eb 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -119,7 +119,7 @@
 # Make long macros shorter
 %global sameevr   %{epoch}:%{version}-%{release}
 %global compatver 10.1
-%global bugfixver 17
+%global bugfixver 18
 
 Name:             mariadb
 Version:          %{compatver}.%{bugfixver}
@@ -1299,6 +1299,9 @@ fi
 %endif
 
 %changelog
+* Tue Oct  4 2016 Jakub Dorňák <jdornak@redhat.com> - 3:10.1.18-1
+- Update to 10.1.18
+
 * Wed Aug 31 2016 Jakub Dorňák <jdornak@redhat.com> - 3:10.1.17-1
 - Update to 10.1.17
 
diff --git a/sources b/sources
index 235c6f7..aaf924a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-036aca95257cb2948dd100605ec6d5a1  mariadb-10.1.17.tar.gz
+173b88ab54bdd1fc51483b6b26bef849  mariadb-10.1.18.tar.gz