diff --git a/site.conf b/site.conf
index 7abb91d..aafea11 100644
--- a/site.conf
+++ b/site.conf
@@ -1,11 +1,11 @@
 {
   hostname_prefix = '',
-  site_name = 'Freifunk München',
-  site_code = 'ffmuc',
+  site_name = 'Freifunk München Umland',
+  site_code = 'ffmuc-umland',
   opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
 
-  prefix4 = '10.80.0.0/16',
-  prefix6 = 'fdef:ffc0:4fff::/64',
+  prefix4 = '10.80.96.0/16',
+  prefix6 = 'fdef:ffc0:4fff:2::/64',
 
   timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
   ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' },
@@ -19,7 +19,7 @@
     channel = 6,
     htmode = 'HT20',
     mesh_ssid = 'mesh.ffmuc',
-    mesh_bssid = '02:0E:8E:1E:61:17',
+    mesh_bssid = '02:0E:8E:1E:61:19',
     mesh_mcast_rate = 12000,
   },
 
@@ -27,14 +27,14 @@
     ssid = 'muenchen.freifunk.net',
     channel = 44,
     htmode = 'HT40+',
-    mesh_ssid = 'mesh.ffmuc',
-    mesh_bssid = '02:0E:8E:1E:61:17',
+    mesh_ssid = 'mesh.ffmuc.umland',
+    mesh_bssid = '02:0E:8E:1E:61:19',
     mesh_mcast_rate = 12000,
   },
 
   next_node = {
-    ip4 = '10.80.0.1',
-    ip6 = 'fdef:ffc0:4fff::1',
+    ip4 = '10.80.64.1',
+    ip6 = 'fdef:ffc0:4fff:2::1',
     mac = '16:41:95:40:f7:dc',
   },
 
@@ -45,62 +45,40 @@
       backbone = {
       limit = 1,
         peers = {
-          gw03 = {
-            key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
+          gwu01 = {
+            key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b',
             remotes = {
-              'ipv4 "gw03.ffmuc.net" port 10000',
-              'ipv4 "gw03.freifunk-muenchen.de" port 10000',
+              'ipv4 "gwu01.ffmuc.net" port 10010',
+              'ipv4 "gwu01.freifunk-muenchen.de" port 10010',
             },
           },
-          gw04 = {
-            key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
+          gwu02 = {
+            key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5',
             remotes = {
-              'ipv4 "gw04.ffmuc.net" port 10000',
-              'ipv4 "gw04.freifunk-muenchen.de" port 10000',
+              'ipv4 "gwu02.ffmuc.net" port 10011',
+              'ipv4 "gwu02.freifunk-muenchen.de" port 10001',
             },
           },
-          gw05 = {
-            key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
+          gwu03 = {
+            key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522',
             remotes = {
-              'ipv4 "gw05.ffmuc.net" port 10000',
-              'ipv4 "gw05.freifunk-muenchen.de" port 10000',
+              'ipv4 "gwu03.ffmuc.net" port 10012',
+              'ipv4 "gwu03.freifunk-muenchen.de" port 10012',
             },
           },
-          gw06 = {
-            key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0',
+          gwu04 = {
+            key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1',
             remotes = {
-              'ipv4 "gw06.ffmuc.net" port 10000',
-              'ipv4 "gw06.freifunk-muenchen.de" port 10000',
+              'ipv4 "gwu04.ffmuc.net" port 10013',
+              'ipv4 "gwu04.freifunk-muenchen.de" port 10013',
             },
           },
-          gw07 = {
-            key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6',
+          gwu05 = {
+            key = 'b6de9fec8569b1fcdea8e7c45224ec30513d24e01af71148c6d640b5df471950',
             remotes = {
-              'ipv4 "gw07.ffmuc.net" port 10000',
-              'ipv4 "gw07.freifunk-muenchen.de" port 10000',
+              'ipv4 "gwu05.ffmuc.net" port 10014',
+              'ipv4 "gwu05.freifunk-muenchen.de" port 10014',
             },
-          },
-          gw08 = {
-            key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055',
-            remotes = {
-              'ipv4 "gw08.ffmuc.net" port 10000',
-              'ipv4 "gw08.freifunk-muenchen.de" port 10000',
-            },
-          },
-          gw09 = {
-            key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0',
-            remotes = {
-              'ipv4 "gw09.ffmuc.net" port 10000',
-              'ipv4 "gw09.freifunk-muenchen.de" port 10000',
-            },
-          },
-          gw10 = {
-            key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf',
-            remotes = {
-              'ipv4 "gw10.ffmuc.net" port 10000',
-              'ipv4 "gw10.freifunk-muenchen.de" port 10000',
-            },
-          },
         },
       },
     },
@@ -113,8 +91,8 @@
       stable = {
         name = 'stable',
         mirrors = {
-          'http://firmware.ffmuc.net/stable/sysupgrade/',
-          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
+          'http://firmware.ffmuc.net/umland/stable/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/umland/stable/sysupgrade/',
         },
         probability = 0.1,
         good_signatures = 2,
@@ -128,8 +106,8 @@
       experimental = {
         name = 'experimental',
         mirrors = {
-          'http://firmware.ffmuc.net/experimental/sysupgrade/',
-          'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/',
+          'http://firmware.ffmuc.net/umland/experimental/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/umland/experimental/sysupgrade/',
         },
         probability = 0.5,
         good_signatures = 2,