diff --git a/Makefile b/Makefile
index 109e10ea..51de583b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
-GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := dc841ea4a37b4e74777e07617042bc92aad2483b # master at 2023-12-13
+GLUON_GIT_URL := https://github.com/grische/gluon.git
+GLUON_GIT_REF := e1785015af62e4a4f7576379c67e28bbf3687cc6
 
 PATCH_DIR := ./patches
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
diff --git a/contrib/genpkglist.py b/contrib/genpkglist.py
index dcbb4a5a..e63dc98f 100755
--- a/contrib/genpkglist.py
+++ b/contrib/genpkglist.py
@@ -180,7 +180,7 @@ def render(self):
 
 PKGS_TLS = PackageList('TLS', [
     'ca-bundle',
-    'libustream-mbedtls'
+    'gluon-libustream-tls'
 ])
 pkglists.append(PKGS_TLS)
 
diff --git a/site.mk b/site.mk
index ea59d759..be492ef0 100644
--- a/site.mk
+++ b/site.mk
@@ -153,11 +153,11 @@ EXCLUDE_PCI_NET := \
 
 INCLUDE_TLS := \
     ca-bundle \
-    libustream-mbedtls
+    gluon-libustream-tls
 
 EXCLUDE_TLS := \
     -ca-bundle \
-    -libustream-mbedtls
+    -gluon-libustream-tls
 
 ifeq ($(GLUON_TARGET),ath79-generic)
     GLUON_SITE_PACKAGES += $(INCLUDE_TLS)