--- a/bin/update	Thu Dec 19 20:47:43 2013 +0200
+++ b/bin/update	Thu Dec 19 21:04:07 2013 +0200
@@ -48,9 +48,9 @@
 
     ## Hosts
     log "Updating forward host zones..."
-    for hosts in $(list_files etc/hosts); do
-        update_hosts_forward    "var/zones/hosts/$hosts"            "$hosts" \
-            "etc/hosts/$hosts"
+    for zone in $(list_dirs etc/hosts/forward); do
+        update_hosts_forward    "var/zones/hosts/forward/$zone"     "$zone" \
+            etc/hosts/forward/$zone/*
     done
 
     log "Updating DHCP hosts..."
@@ -60,9 +60,9 @@
     done
 
     log "Updating reverse host zones..."
-    for zone in $(list_dirs etc/reverse-zones-hosts); do
-        update_hosts_reverse    "var/zones/hosts/$zone"             "$zone" \
-            etc/reverse-zones-hosts/$zone/*
+    for zone in $(list_dirs etc/hosts/reverse); do
+        update_hosts_reverse    "var/zones/hosts/reverse/$zone"     "$zone" \
+            etc/hosts/reverse/$zone/*
     done
 
     ## Zones
@@ -126,7 +126,10 @@
     for dir in var/dhcp/hosts; do
         ensure_dir  $dir
     done
-    for dir in var/zones/includes var/zones/hosts var/zones/reverse-hosts; do
+    for dir in var/zones/includes var/zones/hosts; do
+        ensure_dir  $dir
+    done
+    for dir in var/zones/hosts/forward var/zones/hosts/reverse; do
         ensure_dir  $dir
     done