diff --git a/debian/changelog b/debian/changelog
index 753bc6e..d3222e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 patroni (1.5.5-2) UNRELEASED; urgency=medium
 
-  * 
+  [ Michael Banck ]
+  * debian/pg_createconfig_patroni: Filter out comments from
+    /etc/patroni/dcs.yml when assembling the Patroni configuration file.
 
  -- Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org>  Sat, 16 Feb 2019 07:30:36 +0100
 
diff --git a/debian/pg_createconfig_patroni b/debian/pg_createconfig_patroni
index 8923bb1..0688ac6 100755
--- a/debian/pg_createconfig_patroni
+++ b/debian/pg_createconfig_patroni
@@ -76,7 +76,7 @@ if [ $? != 0 ]; then
     echo "DCS not configured yet, edit /etc/patroni/dcs.yml"
     exit 1
 fi
-DCS_CONFIG="$(cat /etc/patroni/dcs.yml | sed -e ':a;N;$!ba;s/\n/\\n/g' -e 's/\$/\\$/g')"
+DCS_CONFIG="$(egrep -v '^[[:space:]]*$|^ *#' /etc/patroni/dcs.yml | sed -e ':a;N;$!ba;s/\n/\\n/g' -e 's/\$/\\$/g')"
 
 CONFIG_FILE=/etc/patroni/${VERSION}-${CLUSTER}.yml