--- a/bin/update	Tue Dec 17 01:17:49 2013 +0200
+++ b/bin/update	Tue Dec 17 02:06:53 2013 +0200
@@ -49,41 +49,49 @@
 
     log "Updating forward host zones..."
     for hosts in $(list_files etc/hosts); do
-        update_hosts_forward    var/zones/hosts/$hosts              $hosts \
-            etc/hosts/$hosts
+        update_hosts_forward    "var/zones/hosts/$hosts"            "$hosts" \
+            "etc/hosts/$hosts"
     done
 
     log "Updating DHCP hosts..."
     for hosts in $(list_files etc/hosts); do
-        update_hosts_dhcp       var/dhcp/$hosts.conf                \
-            etc/hosts/$hosts
+        update_hosts_dhcp       "var/dhcp/$hosts.conf"              \
+            "etc/hosts/$hosts"
     done
 
     log "Updating reverse host zones..."
         update_hosts_reverse    var/zones/hosts/194.197.235         194.197.235.0/24 \
-            etc/hosts/paivola.fi etc/hosts/*.paivola.fi
+            "etc/hosts/paivola.fi" etc/hosts/*.paivola.fi
+
+         update_hosts_reverse    var/zones/hosts/10                 10.0.0.0/8 \
+            "etc/hosts/*.pvl"
         
         update_hosts_reverse    var/zones/hosts/10.0                10.0.0.0/16 \
-            etc/hosts/test.pvl
-        
+            "etc/hosts/test.pvl"
+
+        update_hosts_reverse    var/zones/hosts/192.168             192.168.0.0/16 \
+            "etc/hosts/*.pvl"
+       
         update_hosts_reverse    var/zones/hosts/fdc4:4cef:395a      fdc4:4cef:395a::/48 \
-            etc/hosts/test.pvl
+            "etc/hosts/test.pvl"
 }
 
 function run_zones {
     log "Copying zone includes..."
     for zone in $(list_files etc/zones/includes); do
-        copy                var/zones/includes/$zone        etc/zones/includes/$zone
+        copy                "var/zones/includes/$zone"      "etc/zones/includes/$zone"
     done
 
     log "Updating zone serials..."
     for zone in $(list_files etc/zones); do
-        update_serial       var/serials/$zone               etc/zones/$zone 
+        update_serial       "var/serials/$zone"             "etc/zones/$zone" \
+            $(zone_includes var/include-cache/$zone etc/zones/$zone var/zones)
+
     done
 
     log "Updating zones..."
     for zone in $(list_files etc/zones); do
-        update_zone         var/zones/$zone                 etc/zones/$zone         var/serials/$zone
+        update_zone         "var/zones/$zone"               "etc/zones/$zone"       "var/serials/$zone"
     done
 
     log "Testing zones..."
@@ -114,7 +122,7 @@
     done
     
     ## Output dirs
-    for dir in var var/dhcp var/zones var/serials; do
+    for dir in var var/dhcp var/zones var/serials var/include-cache; do
         ensure_dir  $dir
     done