diff --git a/templates/etc-mysql-mysql-conf-d-mysqld.cnf b/templates/etc-mysql-mysql-conf-d-mysqld.cnf
index 970a2cf445c93473552ac2a9a4d6e465a3bbaeaf..7e60d853098cb3d8da7477c027176d7cdc964f3a 100644
--- a/templates/etc-mysql-mysql-conf-d-mysqld.cnf
+++ b/templates/etc-mysql-mysql-conf-d-mysqld.cnf
@@ -74,9 +74,12 @@ query_cache_size        = {{ mysql_query_cache_size }}
 log_error = /var/log/mysql/error.log
 #
 # Here you can see queries with especially long duration
-#log_slow_queries	= /var/log/mysql/mysql-slow.log
-#long_query_time = 2
-#log-queries-not-using-indexes
+{% if mysql_debug|default(false) %}
+long_query_time = {{ mysql_debug_long_query_time|default('0.5') }}
+log_queries_not_using_indexes = {{ mysql_debug_missing_index||default('0') }}
+slow_query_log
+slow_query_log_file = /var/log/mysql/slow.log
+{% endif %}
 #
 # The following can be used as easy to replay backup logs or for replication.
 # note: if you are setting up a replication slave, see README.Debian about