diff --git a/postgresql/files/8.4/postgresql.conf.Debian b/postgresql/files/8.4/postgresql.conf.Debian
index 426b209..b912bc6 100644
--- a/postgresql/files/8.4/postgresql.conf.Debian
+++ b/postgresql/files/8.4/postgresql.conf.Debian
@@ -59,7 +59,7 @@
 {%- if server.bind.address == '0.0.0.0' %}
 listen_addresses = '*'
 {%- else %}
-listen_addresses = 'localhost'{% if server.bind.address != '127.0.0.1' %}, '{{ server.bind.address }}'{% endif %}
+listen_addresses = 'localhost{% if server.bind.address != '127.0.0.1' %}, {{ server.bind.address }}{% endif %}'
 {%- endif %}
 port = {{ server.bind.get('port', '5432') }}
 max_connections = 100
diff --git a/postgresql/files/9.1/postgresql.conf.Debian b/postgresql/files/9.1/postgresql.conf.Debian
index 02d8864..b478957 100644
--- a/postgresql/files/9.1/postgresql.conf.Debian
+++ b/postgresql/files/9.1/postgresql.conf.Debian
@@ -59,7 +59,7 @@
 {%- if server.bind.address == '0.0.0.0' %}
 listen_addresses = '*'
 {%- else %}
-listen_addresses = 'localhost'{% if server.bind.address != '127.0.0.1' %}, '{{ server.bind.address }}'{% endif %}
+listen_addresses = 'localhost{% if server.bind.address != '127.0.0.1' %}, {{ server.bind.address }}{% endif %}'
 {%- endif %}
 port = {{ server.bind.get('port', '5432') }}
 max_connections = 100
diff --git a/postgresql/files/9.3/postgresql.conf.Debian b/postgresql/files/9.3/postgresql.conf.Debian
index 69b7d25..96e26d9 100644
--- a/postgresql/files/9.3/postgresql.conf.Debian
+++ b/postgresql/files/9.3/postgresql.conf.Debian
@@ -60,7 +60,7 @@
 {%- if server.bind.address == '0.0.0.0' %}
 listen_addresses = '*'
 {%- else %}
-listen_addresses = 'localhost'{% if server.bind.address != '127.0.0.1' %}, '{{ server.bind.address }}'{% endif %}
+listen_addresses = 'localhost{% if server.bind.address != '127.0.0.1' %}, {{ server.bind.address }}{% endif %}'
 {%- endif %}
 port = {{ server.bind.get('port', '5432') }}
 max_connections = 100			# (change requires restart)
diff --git a/postgresql/files/9.5/postgresql.conf.Debian b/postgresql/files/9.5/postgresql.conf.Debian
index 231ea93..91492fd 100644
--- a/postgresql/files/9.5/postgresql.conf.Debian
+++ b/postgresql/files/9.5/postgresql.conf.Debian
@@ -59,7 +59,7 @@
 {%- if server.bind.address == '0.0.0.0' %}
 listen_addresses = '*'
 {%- else %}
-listen_addresses = 'localhost'{% if server.bind.address != '127.0.0.1' %}, '{{ server.bind.address }}'{% endif %}
+listen_addresses = 'localhost{% if server.bind.address != '127.0.0.1' %}, {{ server.bind.address }}{% endif %}'
 {%- endif %}
 port = {{ server.bind.get('port', '5432') }}
 #listen_addresses = 'localhost'		# what IP address(es) to listen on;