diff --git a/backupninja/files/handler/mysql.conf b/backupninja/files/handler/mysql.conf
index f9e2ff5..8a16ca5 100644
--- a/backupninja/files/handler/mysql.conf
+++ b/backupninja/files/handler/mysql.conf
@@ -1,6 +1,6 @@
 ### backupninja mysql config file ###
 
-databases   = {% for db in pillar.mysql.server.databases %} {{ db.name }}{% endfor %}
+databases   = {% for db in pillar.mysql.server.get('databases', []) %} {{ db.name }}{% endfor %} {% for db_name, db in pillar.mysql.server.get('database', {}).iteritems() %} {{ db_name }}{% endfor %}
 backupdir   = /var/backups/mysql
 hotcopy     = no
 sqldump     = yes