diff --git a/HISTORY.txt b/HISTORY.txt
index 0f414cb..2b6e468 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -2,6 +2,8 @@
 
 - When copying buildout extra directory, preserve file modes.
   [smcmahon]
+- Fix incorrect indentation with plone_zope_conf_additional
+  [fulv]
 
 1.3.8 2020-02-15
 
diff --git a/templates/buildout.cfg.j2 b/templates/buildout.cfg.j2
index ebb4bfd..d06b143 100644
--- a/templates/buildout.cfg.j2
+++ b/templates/buildout.cfg.j2
@@ -231,7 +231,7 @@ http-address = 127.0.0.1:{{ instance_config.plone_client_base_port }}
 {% if instance_config.plone_zope_conf_additional or instance_config.plone_client_tcpcheck %}
 zope-conf-additional =
 {% if instance_config.plone_zope_conf_additional %}
-    {{ instance_config.plone_zope_conf_additional }}
+    {{ instance_config.plone_zope_conf_additional | indent(4) }}
 {% endif %}
 {% if instance_config.plone_client_tcpcheck %}
     <product-config five.z2monitor>
@@ -248,7 +248,7 @@ http-address = 127.0.0.1:{{ "%s" % (instance_config.plone_client_base_port|int +
 {% if instance_config.plone_zope_conf_additional or instance_config.plone_client_tcpcheck %}
 zope-conf-additional =
 {% if instance_config.plone_zope_conf_additional %}
-    {{ instance_config.plone_zope_conf_additional }}
+    {{ instance_config.plone_zope_conf_additional | indent(4)  }}
 {% endif %}
 {% if instance_config.plone_client_tcpcheck %}
     <product-config five.z2monitor>