diff --git a/gluon b/gluon
index 01312a2..8ed5c56 160000
--- a/gluon
+++ b/gluon
@@ -1 +1 @@
-Subproject commit 01312a22a68992d8996bcf705313a7ae48586788
+Subproject commit 8ed5c56245be497248e39c403197dde5b203f015
diff --git a/modules b/modules
index b5e974d..b34ff29 100644
--- a/modules
+++ b/modules
@@ -1,10 +1,5 @@
 GLUON_SITE_FEEDS='ffhb ffffmpackages'
 
-# Just till it is merged upstream
-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