diff --git a/Makefile b/Makefile
index 38914d1..b72c760 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,14 @@
 GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := v2015.1
+GLUON_GIT_REF := master
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 
 GLUON_TARGETS ?= \
 	ar71xx-generic \
 	ar71xx-nand \
+	mpc85xx-generic \
+	x86-generic \
 	x86-kvm_guest
 
 GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
@@ -17,9 +19,10 @@ else
 endif
 
 JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)
-JOBS = 1
 
-GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \
+#JOBS = 1
+
+GLUON_MAKE := ${MAKE} V=s -j ${JOBS} -C ${GLUON_BUILD_DIR} \
 			GLUON_RELEASE=${GLUON_RELEASE} \
 			GLUON_BRANCH=${GLUON_BRANCH} \
 
@@ -42,7 +45,7 @@ build: gluon-prepare
 
 manifest: build
 	${GLUON_MAKE} manifest
-	mv ${GLUON_BUILD_DIR}/images .
+	mv ${GLUON_BUILD_DIR}/output .
 
 sign: manifest
 	${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} images/sysupgrade/${GLUON_BRANCH}.manifest
@@ -51,7 +54,10 @@ ${GLUON_BUILD_DIR}:
 	git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR}
 
 gluon-prepare: images-clean ${GLUON_BUILD_DIR}
-	(cd ${GLUON_BUILD_DIR} && git fetch origin && git checkout -q ${GLUON_GIT_REF})
+	(cd ${GLUON_BUILD_DIR} \
+	  && git remote set-url origin ${GLUON_GIT_URL} \
+	  && git fetch origin \
+	  && git checkout -q ${GLUON_GIT_REF})
 	ln -sfT .. ${GLUON_BUILD_DIR}/site
 	${GLUON_MAKE} update
 
diff --git a/site.conf b/site.conf
index 42cb984..8f97cc7 100644
--- a/site.conf
+++ b/site.conf
@@ -1,8 +1,11 @@
 {
-  hostname_prefix = 'freifunk-rgb_',
+  hostname_prefix = '',
   site_name = 'Freifunk Regensburg',
   site_code = 'ffrgb-bat15',
-  opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
+
+  opkg = {
+    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+  },
 
   prefix4 = '10.90.0.0/16',
   prefix6 = 'fdef:f00f:1337:cafe/64',
@@ -15,21 +18,27 @@
   regdom = 'DE',
 
   wifi24 = {
-    ssid = 'regensburg.freifunk.net',
     channel = 1,
-    htmode = 'HT40+',
-    mesh_ssid = 'mesh.ffrgb',
-    mesh_bssid = '02:0E:8E:1E:61:17',
-    mesh_mcast_rate = 12000,
+    ap = {
+      ssid = 'regensburg.freifunk.net',
+    },
+    ibss = {
+      ssid = 'mesh.ffrgb',
+      bssid = '02:0E:8E:1E:61:17',
+      mcast_rate = 12000,
+    },
   },
 
   wifi5 = {
-    ssid = 'regensburg.freifunk.net',
     channel = 44,
-    htmode = 'HT40+',
-    mesh_ssid = 'mesh.ffrgb',
-    mesh_bssid = '02:0E:8E:1E:61:17',
-    mesh_mcast_rate = 12000,
+    ap = {
+      ssid = 'regensburg.freifunk.net',
+    },
+    ibss = {
+      ssid = 'mesh.ffrgb',
+      bssid = '02:0E:8E:1E:61:17',
+      mcast_rate = 12000,
+    }
   },
 
   next_node = {
@@ -40,6 +49,11 @@
 
 
   fastd_mesh_vpn = {
+    bandwidth_limit = {
+      enabled = false,
+      ingress = 12000,
+      egress = 1200,
+    },
     methods = {'salsa2012+umac'},
     mtu = 1426,
     groups = {
@@ -93,14 +107,5 @@
       },
     },
   },
-
-  simple_tc = {
-    mesh_vpn = {
-      ifname = 'mesh-vpn',
-      enabled = false,
-      limit_egress = 1200,
-      limit_ingress = 12000,
-    },
-  },
 }
 -- vim: set ft=lua:ts=2:sw=2:et