diff --git a/Makefile b/Makefile
index 971bc58..33240e1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
-GLUON_GIT_URL := https://github.com/tecff/gluon.git
-GLUON_GIT_REF := v2016.1.1-tecff-1
+GLUON_GIT_URL := https://github.com/freifunkmuc/gluon.git
+GLUON_GIT_REF := 6b609b78224e62a6c198c8af9bd19b4276040cb1
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key