diff --git a/Makefile b/Makefile
index 75539e4..edb0bb8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
-GLUON_GIT_URL := https://github.com/ffrgb/gluon
-GLUON_GIT_REF := v2016.2.7
+GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon
+GLUON_GIT_REF := 3d824bd21d7f6d5db6dc238d2a68b62de471aa2a
 
 #https://github.com/freifunk-gluon/gluon/commit/6b8888fe5aebd941c5e7a83a97ceb0678bee4c43
 
@@ -17,8 +17,8 @@ GLUON_TARGETS ?= \
 	x86-64 \
 	x86-generic \
 	sunxi \
-	x86-kvm_guest 
-	
+	x86-kvm_guest
+
 
 GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
 ifneq (,$(shell git describe --exact-match --tags 2>/dev/null))
@@ -53,7 +53,7 @@ build: gluon-prepare
 		${GLUON_MAKE} GLUON_TARGET="$$target"; \
 	done
 
-buildonly: 
+buildonly:
 	for target in ${GLUON_TARGETS}; do \
                 echo ""Building target $$target""; \
                 ${GLUON_MAKE} GLUON_TARGET="$$target"; \
diff --git a/extra/sites.conf b/extra/sites.conf
index 3f5ce61..271b712 100644
--- a/extra/sites.conf
+++ b/extra/sites.conf
@@ -33,7 +33,7 @@
 	},
 	{
 		site_name = 'Freifunk Regensburg - Legacy',
-		site_code = 'ffrgb_legacy',
+		site_code = 'ffrgb',
 		subst = {
 			['%%SS'] = 'regensburg.freifunk.net',
 		},
diff --git a/site.conf b/site.conf
index f9071dc..9b12b1a 100644
--- a/site.conf
+++ b/site.conf
@@ -97,7 +97,7 @@
         pubkeys = {
           '4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
           '130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
-	  'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
+          'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
         },
       },
       experimental = {
@@ -108,8 +108,8 @@
         good_signatures = 1,
         pubkeys = {
           '4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
-	  '130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
-	  'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
+          '130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
+          'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
         },
       },
     },
diff --git a/site.mk b/site.mk
index 895b756..63b9062 100644
--- a/site.mk
+++ b/site.mk
@@ -1,6 +1,5 @@
 GLUON_SITE_PACKAGES := \
 	gluon-mesh-batman-adv-15 \
-	gluon-alfred \
 	gluon-respondd \
 	gluon-autoupdater \
 	gluon-config-mode-core \
@@ -28,9 +27,11 @@ GLUON_SITE_PACKAGES := \
 	gluon-ebtables-filter-arp-ffmuc \
 	gluon-ebtables-filter-multicast-ffmuc \
 	gluon-ssid-changer \
-	respondd-module-airtime \
-	ffho-config-mode-site-select \
-	ffho-site-generate
+	ffrgb-banner \
+	respondd-module-airtime #\
+	#ffho-site-generate \
+	#ffho-config-mode-site-select \
+
 
 # basic support for USB stack
 USB_PACKAGES_BASIC := \