diff --git a/.gitignore b/.gitignore
index b25c15b..0acb982 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
 *~
+/site.conf
+/site.mk
+/modules
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..5d45c2b
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,18 @@
+all: check_site site.mk site.conf modules
+
+.PHONY: check_site
+check_site:
+	if test -z "${SITE}"; then echo Usage: make SITE=ffhh; exit 1; else true; fi
+
+.PHONY: clean
+clean:
+	rm -f site.mk site.conf modules
+
+modules:
+	cp sites/${SITE}/$@ $@
+
+site.conf:
+	cp sites/${SITE}/$@ $@
+
+site.mk:
+	cp sites/${SITE}/$@ $@
diff --git a/README.md b/README.md
index 50a73cf..c0e8baf 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,9 @@
     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
+    cd site
+    make SITE=ffhh
+    cd ..
     make update                                                    # Get other repositories used by Gluon
     make                                                           # Build Gluon
 
@@ -11,6 +14,11 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
+- 0.8.4.1: v2016.2.7 new package: ssid-changer
+- 0.8.4: v2016.2.7 (updated openwrt/package/network/services/dnsmasq/Makefile: PKG\_VERSION:=2.78 & PKG\_MD5SUM:=6d0241b72c79d2b510776ccc4ed69ca4)
+- 0.8.3: v2016.2.6 (ffhh-sued only)
+- 0.8.2: v2016.2.5
+- 0.8.1: v2016.2.4 (ffhh-sued only)
 - 0.8: v2016.1.4
 - 0.7.1: v2015.1.2
 - 0.7: v2015.1
diff --git a/modules b/modules
deleted file mode 100644
index 6416262..0000000
--- a/modules
+++ /dev/null
@@ -1,5 +0,0 @@
-GLUON_SITE_FEEDS='ffhh_packages'
-
-PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git
-PACKAGES_FFHH_PACKAGES_COMMIT=ef9fcc1222f74c3c045b1450537a4b8b80efb56c
-
diff --git a/sites/ffhh/modules b/sites/ffhh/modules
new file mode 100644
index 0000000..b00c4f5
--- /dev/null
+++ b/sites/ffhh/modules
@@ -0,0 +1,7 @@
+GLUON_SITE_FEEDS='ffhh_packages eulenfunk'
+
+PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git
+PACKAGES_FFHH_PACKAGES_COMMIT=ef9fcc1222f74c3c045b1450537a4b8b80efb56c
+
+PACKAGES_EULENFUNK_REPO=https://github.com/eulenfunk/packages.git
+PACKAGES_EULENFUNK_COMMIT=1951b97db14ca7b098db76cd6c64363a14de3903
diff --git a/site.conf b/sites/ffhh/site.conf
similarity index 89%
rename from site.conf
rename to sites/ffhh/site.conf
index 9352061..f496add 100644
--- a/site.conf
+++ b/sites/ffhh/site.conf
@@ -122,11 +122,13 @@
 				mirrors = {'http://1.updates.services.ffhh/stable/sysupgrade','http://2.updates.services.ffhh/stable/sysupgrade'},
 				good_signatures = 2,
 				pubkeys = {
-					'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo
 					'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
 					'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
 					'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
 					'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
+					'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', -- daniel
+					'961495a04512e5ba1843fd3c216d8af6ef2fdb19f93055142803e2da26d670b9', -- alexander
+					'ed6278f168f0382adf4f058cb9c31d8f1145abb968a8626045de7d6d87a0be40', -- olli
 				},
 			},
 			beta = {
@@ -134,11 +136,13 @@
 				mirrors = {'http://1.updates.services.ffhh/beta/sysupgrade','http://2.updates.services.ffhh/beta/sysupgrade'},
 				good_signatures = 2,
 				pubkeys = {
-					'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo
 					'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
 					'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
 					'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
 					'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
+					'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', -- daniel
+					'961495a04512e5ba1843fd3c216d8af6ef2fdb19f93055142803e2da26d670b9', -- alexander
+					'ed6278f168f0382adf4f058cb9c31d8f1145abb968a8626045de7d6d87a0be40', -- olli
 				},
 			},
 			experimental = {
diff --git a/site.mk b/sites/ffhh/site.mk
similarity index 93%
rename from site.mk
rename to sites/ffhh/site.mk
index 4d22bed..c95cc5c 100644
--- a/site.mk
+++ b/sites/ffhh/site.mk
@@ -20,13 +20,14 @@ GLUON_SITE_PACKAGES := \
 	gluon-radvd \
 	gluon-respondd \
 	gluon-setup-mode \
+	gluon-ssid-changer \
 	gluon-status-page \
 	iwinfo \
 	iptables \
 	haveged
 
 
-DEFAULT_GLUON_RELEASE := 0.8+exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 0.8.4.1
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)