diff --git a/modules b/modules
index fe85ea96d24d43ce2d084b4846f0841063632b1c..e3ffbc51899595d2ee73ee3ba22b5c28beedc4be 100644
--- a/modules
+++ b/modules
@@ -1,4 +1,4 @@
 GLUON_SITE_FEEDS='ffol'
 
 PACKAGES_FFOL_REPO=git://git.freifunk-ol.de/ffol/packages.git
-PACKAGES_FFOL_COMMIT=1322af476e0fffb11f907e65b6f523d5a2c34729
+PACKAGES_FFOL_COMMIT=9928aec7e55bcb01462f7f5ab5bbd6a0c018f813
diff --git a/site.conf b/site.conf
index 82717ea4bc9fb5cccf5713ef15623cccf0cb6b21..829ab8640552bc550b0ec55504259699f45bfb4b 100644
--- a/site.conf
+++ b/site.conf
@@ -2,7 +2,7 @@
 	hostname_prefix => 'ffol',
 	site_name => 'Freifunk Oldenburg',
 	site_code => 'ffol',
-	release => '0.5' . stable,
+	release => '0.5.1-' . nightly,
 
 	prefix4 => '10.18.0.0/16',
 	prefix6 => 'fd74:fdaa:9dc4::/64',
diff --git a/site.mk b/site.mk
index 9989817c57b6bb56415cda79a70f5052008b2225..b1127fc121296d092064e8b6b6b08bfdf3fa6a0f 100644
--- a/site.mk
+++ b/site.mk
@@ -14,4 +14,6 @@ GLUON_SITE_PACKAGES := \
 	haveged \
 	gluon-status-page \
 	gluon-next-node \
-	ffol-fastdreg
+	ffol-fastdreg \
+	ffol-configurator \
+	ffol-nodewatcher