diff --git a/README.md b/README.md
index 0c25f5d..50a73cf 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 #### How to build the Freifunk Hamburg Firmware
-    
+
     git clone https://github.com/freifunk-gluon/gluon.git            # Get the official Gluon repository
     cd gluon
     git clone https://github.com/freifunkhamburg/site-ffhh.git site  # Get the Freifunk Hamburg site repository
@@ -11,12 +11,15 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
+- 0.8: v2016.1.4
+- 0.7.1: v2015.1.2
 - 0.7: v2015.1
 - 0.6: v2014.4
+- 0.5.1: v2014.3.1
 - 0.5: v2014.3
 - 0.4.2: v2014.2
  - note: no gluon fork used anymore
 - 0.4.1: v2014.2-hh
  - equal to official gluon v2014.2 + ffhh specific patches
 - 0.4a: v2014.1a
- - equal to official gluon v2014.1 + ffhh specific patches 
+ - equal to official gluon v2014.1 + ffhh specific patches
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 b9b6282..4b89dfe 100644
--- a/site.conf
+++ b/site.conf
@@ -6,7 +6,7 @@
 	opkg = {
 		openwrt = 'http://opkg.services.ffhh/%n/%v/%S/packages',
 		extra = {
-			modules = 'http://1.updates.services.ffhh/experimental/modules/gluon-%GS-%GR/%S',
+			modules = 'http://updates.hamburg.freifunk.net/stable/archive/modules/gluon-%GS-%GR/%S',
 		},
 	},
 
diff --git a/site.mk b/site.mk
index f560cd7..bda5e1e 100644
--- a/site.mk
+++ b/site.mk
@@ -13,7 +13,6 @@ GLUON_SITE_PACKAGES := \
 	gluon-luci-autoupdater \
 	gluon-luci-portconfig \
 	gluon-luci-private-wifi \
-	gluon-luci-wifi-config \
 	gluon-next-node \
 	gluon-mesh-vpn-fastd \
 	gluon-radvd \
@@ -26,7 +25,7 @@ GLUON_SITE_PACKAGES := \
 	haveged
 
 
-DEFAULT_GLUON_RELEASE := 0.8~exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 0.8
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)