diff --git a/mariadb-10.2.13-aarch_compilefix.patch b/mariadb-10.2.13-aarch_compilefix.patch
new file mode 100644
index 0000000..34532bc
--- /dev/null
+++ b/mariadb-10.2.13-aarch_compilefix.patch
@@ -0,0 +1,13 @@
+--- mariadb-10.2.13/storage/innobase/CMakeLists.txt	2018/03/13 23:32:34	1.1
++++ mariadb-10.2.13/storage/innobase/CMakeLists.txt	2018/03/13 23:33:42
+@@ -175,7 +175,10 @@
+       btr/btr0btr.cc
+       btr/btr0cur.cc
+       buf/buf0buf.cc
++      fts/fts0fts.cc
+       gis/gis0sea.cc
++      handler/handler0alter.cc
++      row/row0mysql.cc
+       COMPILE_FLAGS "-O0"
+       )
+   ENDIF()
diff --git a/mariadb.changes b/mariadb.changes
index b743b71..ffedc6d 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Mar 14 00:35:11 CET 2018 - ro@suse.de
+
+- fix build on aarch64: compile a few more files with -O0
+  from https://jira.mariadb.org/browse/MDEV-14318
+  add patch mariadb-10.2.13-aarch_compilefix.patch
+
 -------------------------------------------------------------------
 Tue Feb 27 14:13:50 UTC 2018 - rsalevsky@suse.com
 
diff --git a/mariadb.spec b/mariadb.spec
index 3c6dc7c..efe728f 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -82,6 +82,7 @@ Patch10:        mariadb-10.2.3-mysql_install_db-mariadb_dirs.patch
 Patch11:        mariadb-10.2.9-galera_cnf.patch
 Patch12:        mariadb-10.2.10-disable_openssl_compatibility_check.patch
 Patch13:        mariadb-10.2.14-xtrabackup-v2.patch
+Patch14:        mariadb-10.2.13-aarch_compilefix.patch
 BuildRequires:  bison
 BuildRequires:  cmake
 BuildRequires:  dos2unix
@@ -342,6 +343,13 @@ applications with MariaDB.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%ifarch aarch64
+%if 0%{?suse_version} == 1315
+# gcc48 on sle12 on aarch64 has some optimisation issues
+# add some more files to the list of sources compiled with -O0
+%patch14 -p1
+%endif
+%endif
 
 cp %{_sourcedir}/suse-test-run .