diff --git a/.gitmodules b/.gitmodules
index 8cf6535..9254b7b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "gluon"]
 	path = gluon
-	url = https://github.com/christf/gluon.git
+	url = https://github.com/FreifunkBremen/gluon.git
diff --git a/gluon b/gluon
index 4cbe63f..37fb7a1 160000
--- a/gluon
+++ b/gluon
@@ -1 +1 @@
-Subproject commit 4cbe63ffbbe68e92e76fd95b293a8a8670ae0883
+Subproject commit 37fb7a1ede0ffc3119e15399c517f84e3c3d9ea7
diff --git a/modules b/modules
index 2a3bf08..227f075 100644
--- a/modules
+++ b/modules
@@ -10,7 +10,7 @@ PACKAGES_GLUON_BRANCH=genofire-clientcount
 PACKAGES_GLUON_COMMIT=a559097e8c138e7ffa45696446be34f8acf83b85
 
 PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
-PACKAGES_FFHB_COMMIT=632dcc2a57838700ddce880571f7134b15d0dffc
+PACKAGES_FFHB_COMMIT=8532bb587afbadb2e95d3677b8ce92e704cbe713
 PACKAGES_FFHB_BRANCH=events
 
 PACKAGES_FFFFMPACKAGES_REPO=git://github.com/freifunk-ffm/packages.git