diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4261cab3..91919dd9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ The **patch** part changes incrementally at each release.
 * minifirewall: change some defaults
 * nagios-nrpe: update check_phpfpm_status.pl & install perl dependencies
 * redis: use /run instead or /var/run
+* redis: escape password in Munin configuration
 * bind9: moved logs from /var/log/bind* to /var/log/named/* to fix problems with apparmor
 
 ### Fixed
diff --git a/redis/templates/munin-plugin-instances.conf.j2 b/redis/templates/munin-plugin-instances.conf.j2
index 7e6a00ac..3a0551fc 100644
--- a/redis/templates/munin-plugin-instances.conf.j2
+++ b/redis/templates/munin-plugin-instances.conf.j2
@@ -4,5 +4,5 @@
 env.title_prefix Instance {{ redis_instance_name }}
 env.port {{ redis_port }}
 {% if redis_password %}
-env.password {{ redis_password }}
+env.password {{ redis_password | replace("#", "\#") }}
 {% endif %}