diff --git a/bind/files/named.conf.options b/bind/files/named.conf.options
index 3ea419d..0e257df 100644
--- a/bind/files/named.conf.options
+++ b/bind/files/named.conf.options
@@ -26,6 +26,22 @@
      listen-on-v6 { {{ server.get('ipv6_listen', 'any') }}; };
      {%- endif %}
 
+     {%- if server.get('allow_new_zones', False) %}
+     allow-new-zones yes;
+     {%- endif %}
+
+     {%- if server.get('query', False) %}
+     allow-query {
+          {%- if server.query.hosts is defined %}
+          {%- for host in server.query.hosts %}
+          {{ host }};
+          {%- endfor %}
+          {%- else %}
+          any;
+          {%- endif %}
+     };
+     {%- endif %}
+
      {%- if server.get('version', 'hidden') != True %}
      version "{{ server.get('version', 'hidden') }}";
      {%- endif %}
diff --git a/bind/server/init.sls b/bind/server/init.sls
index 55e6006..5dd28e2 100644
--- a/bind/server/init.sls
+++ b/bind/server/init.sls
@@ -1,3 +1,5 @@
 include:
 - bind.server.service
-- bind.server.zone
\ No newline at end of file
+{%- if pillar.bind.server.zone is defined %}
+- bind.server.zone
+{%- endif %}
\ No newline at end of file