diff --git a/defaults/main.yml b/defaults/main.yml
index 528c61b..5e40cf0 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -46,7 +46,7 @@ mysql_thread_concurrency: 2
 mysql_innodb_file_per_table: '1'
 mysql_innodb_buffer_pool_size: "{{ (ansible_memtotal_mb * 0.2) | round | int }}M"
 mysql_innodb_additional_mem_pool_size: '20M' # See: http://dev.mysql.com/doc/refman/5.7/en/innodb-parameters.html#sysvar_innodb_additional_mem_pool_size
-mysql_innodb_log_file_size: '64M'
+mysql_innodb_log_file_size: '64M' # If this setting changes on a running system, you will break it! http://dev.mysql.com/doc/refman/5.6/en/innodb-data-log-reconfiguration.html
 mysql_innodb_log_buffer_size: '8M'
 mysql_innodb_flush_log_at_trx_commit: '1'
 mysql_innodb_lock_wait_timeout: 50
diff --git a/templates/etc/mysql/my.cnf.j2 b/templates/etc/mysql/my.cnf.j2
index c47358f..452a40b 100644
--- a/templates/etc/mysql/my.cnf.j2
+++ b/templates/etc/mysql/my.cnf.j2
@@ -66,13 +66,15 @@ innodb_buffer_pool_size = {{ mysql_innodb_buffer_pool_size }}
 {% if mysql_vendor != 'mariadb' or mysql_mariadb_version | version_compare('10.0', '<') %}
 innodb_additional_mem_pool_size = {{ mysql_innodb_additional_mem_pool_size }}
 {% endif %}
-#innodb_log_file_size = {{ mysql_innodb_log_file_size }}
-#innodb_log_buffer_size = {{ mysql_innodb_log_buffer_size }}
-
-{# It craches after install (mysql 5.5)... TODO FIX -> http://dev.mysql.com/doc/refman/5.6/en/innodb-data-log-reconfiguration.html #}
+innodb_log_buffer_size = {{ mysql_innodb_log_buffer_size }}
 innodb_flush_log_at_trx_commit = {{ mysql_innodb_flush_log_at_trx_commit }}
 innodb_lock_wait_timeout = {{ mysql_innodb_lock_wait_timeout }}
 
+{# If this setting changes on a running system, you will break it! #}
+{# See how tho change it here: http://dev.mysql.com/doc/refman/5.6/en/innodb-data-log-reconfiguration.html #}
+{# TODO FIX -> Maybe detect a change and fail, just to be safe? #}
+innodb_log_file_size = {{ mysql_innodb_log_file_size }}
+
 [mysqldump]
 quick
 max_allowed_packet = {{ mysql_mysqldump_max_allowed_packet }}