diff --git a/README.md b/README.md
index fb38836..9760233 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Helgoland Freifunk Firmware builds
 
+- 0.8:    v2016.1.2
 - 0.7.1:  v2015.1.1
 - 0.7:    skipped
 - 0.6:    v2014.4
diff --git a/modules b/modules
index bf36246..6a1e244 100644
--- a/modules
+++ b/modules
@@ -1,4 +1,5 @@
 GLUON_SITE_FEEDS='ffhh_packages'
 
 PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git
-PACKAGES_FFHH_PACKAGES_COMMIT=0a70ceb1c636a5a21ce47e39513031e3794daea2
+PACKAGES_FFHH_PACKAGES_COMMIT=58a026ad0dbea4bd2727ce30a410bd9c6fdbaaa7
+
diff --git a/site.conf b/site.conf
index f487d1b..8c68d84 100644
--- a/site.conf
+++ b/site.conf
@@ -6,7 +6,7 @@
 	opkg = {
 		openwrt = 'http://opkg.services.ffhh/%n/%v/%S/packages',
 		extra = {
-			modules = 'http://updates.helgoland.freifunk.net/experimental/modules/gluon-%GS-%GR/%S',
+			modules = 'http://updates.helgoland.freifunk.net/stable/archive/modules/gluon-%GS-%GR/%S',
 		},
 	},
 
@@ -22,15 +22,10 @@
 		ap = {
 			ssid = 'helgoland.freifunk.net',
 		},
-		ibss = {
-			ssid = '14:cc:20:92:0f:e9',
-			bssid = '14:cc:20:92:0f:e9',
-			mcast_rate = 12000,
-		},
-		--[[ mesh = {
+		mesh = {
 			id = 'ff-helgo-mesh',
 			mcast_rate = 12000,
-		}, --]]
+		},
 	},
 
 	wifi5 = {
@@ -38,15 +33,10 @@
 		ap = {
 			ssid = 'helgoland.freifunk.net',
 		},
-		ibss = {
-			ssid = '14:cc:20:92:0f:e9',
-			bssid = '14:cc:20:92:0f:e9',
-			mcast_rate = 12000,
-		},
-		--[[ mesh = {
+		mesh = {
 			id = 'ff-helgo-mesh',
 			mcast_rate = 12000,
-		}, --]]
+		},
 	},
 
 	next_node = {
diff --git a/site.mk b/site.mk
index 5736268..16f8e0d 100644
--- a/site.mk
+++ b/site.mk
@@ -1,7 +1,6 @@
 GLUON_SITE_PACKAGES := \
 	gluon-mesh-batman-adv-14 \
 	gluon-alfred \
-	gluon-announced \
 	gluon-autoupdater \
 	gluon-config-mode-autoupdater \
 	gluon-config-mode-core \
@@ -17,6 +16,7 @@ GLUON_SITE_PACKAGES := \
 	gluon-next-node \
 	gluon-mesh-vpn-fastd \
 	gluon-radvd \
+	gluon-respondd \
 	gluon-setup-mode \
 	gluon-status-page \
 	fastd-traffic-status \
@@ -26,7 +26,7 @@ GLUON_SITE_PACKAGES := \
 
 
 
-DEFAULT_GLUON_RELEASE := 0.8~exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 0.8
 # for experimental firmware:
 # DEFAULT_GLUON_RELEASE := 0.6+exp$(shell date '+%Y%m%d')