diff --git a/tasks/galera_post_install.yml b/tasks/galera_post_install.yml
index b53d9433..30c21b64 100644
--- a/tasks/galera_post_install.yml
+++ b/tasks/galera_post_install.yml
@@ -55,6 +55,18 @@
   tags:
     - galera-client-user-config
 
+# NOTE: (mancdaz) this should not be needed with mariadb-10.1 since its
+#       initscript sources /etc/default/mariadb
+- name: fix mysql startup timeout
+  lineinfile:
+    dest: /etc/init.d/mysql
+    state: present
+    insertafter: '^export HOME=/etc/mysql/'
+    line: '[ -r /etc/default/mysql ] && . /etc/default/mysql'
+    backup: yes
+
+# NOTE: (mancdaz) The target will need to change to /etc/default/mariadb
+#       for mariadb-10.1
 - name: Drop mariadb config(s)
   template:
     src: "mysql_defaults.j2"