diff --git a/apacheds/init.sls b/apacheds/init.sls
index db0b247..ef1502f 100644
--- a/apacheds/init.sls
+++ b/apacheds/init.sls
@@ -37,7 +37,7 @@ Apache Directory Server Config:
       ads_home: {{ads.opt_dir}}/ads
       java_home: {{java.java_home}}
       java_opts: ""
-      ads_shutdown_port: ""
+      ads_shutdown_port: "0"
       ads_instances: {{ads.instances}}
     - require:
         - AdsDirs
@@ -59,7 +59,16 @@ ADS Instance{{key}} Log Props:
     - template: jinja
     - defaults:
       log_file: "/tmp/{{key}}.log"
+
+   
+    # Create a base 64 encoded ads-contextentry 
+    # see: https://directory.apache.org/apacheds/basic-ug/1.4.3-adding-partition.html
  
+    {% 	
+     set ads_contextentry = "dn: "+'dc=planix,dc=org\n'+"dc: "+key+"\n"+
+			"objectclass: domain\nobjectclass: top\n\n"
+    %}
+
     {%- if not salt['file.file_exists' ](ads.instances +"/" + key + "/conf/config.ldif_migrated") %}
 ADS Instance{{key}} New Conf Dir: 
   file.managed:
@@ -70,7 +79,7 @@ ADS Instance{{key}} New Conf Dir:
       partitionid: tube
       partitionsuffix: "dc=planix,dc=org"
       ldap_port: 12389
-      ads_contextentry: ""
+      ads_contextentry: "{{ads_contextentry | base64_encode }}"
  
     {%- endif %}
   {% endfor %}