diff --git a/modules b/modules
index cb131a6..b5e974d 100644
--- a/modules
+++ b/modules
@@ -1,9 +1,9 @@
 GLUON_SITE_FEEDS='ffhb ffffmpackages'
 
 # Just till it is merged upstream
-PACKAGES_GLUON_REPO=git://github.com/freifunk-ffm/packages-1.git
-PACKAGES_GLUON_BRANCH=l3roamdbump
-PACKAGES_GLUON_COMMIT=d2e532c37029a1431c88a48de2f2e1c9caec88a6
+PACKAGES_GLUON_REPO=git://github.com/genofire/gluon-packages.git
+PACKAGES_GLUON_BRANCH=genofire-clientcount
+PACKAGES_GLUON_COMMIT=a559097e8c138e7ffa45696446be34f8acf83b85
 
 PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
 PACKAGES_FFHB_COMMIT=e314a51ebbd5e8b6da3ab2744354869b7740913a