diff --git a/README.md b/README.md
index 01cc4a6..8f05274 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
+- v2021.1.1.0: site-ffhh: v2021.1.1.0, gluon: v2021.1.1
 - v2020.2.3.0: site-ffhh: v2020.2.3.0, gluon: v2020.2.3
 - v2020.2.2.0: site-ffhh: v2020.2.2.0, gluon: v2020.2.2
 - v2020.1.4.0: site-ffhh: v2020.1.4.0, gluon: v2020.1.4
diff --git a/build.conf b/build.conf
index 3185df3..fa24547 100644
--- a/build.conf
+++ b/build.conf
@@ -1,5 +1,4 @@
-GLUON_RELEASE="v2020.2.2.0"
-GLUON_BRANCH="stable"
+GLUON_RELEASE="v2021.1.1.0"
 targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x sunxi-cortexa7 x86-64 x86-generic x86-geode"
 broken_images=(
 	'*dir*615*d*'
diff --git a/build.sh b/build.sh
index 4bf0eed..c907d12 100755
--- a/build.sh
+++ b/build.sh
@@ -11,6 +11,7 @@ function usage () {
 	echo "       -a              Automatically detect and build all targets." >&2
 	echo "       -o OUT_PATH     Path to the firmware output directory. Default: ${gluon_out}" >&2
 	echo "       -s SIGNATURE    Sign firmware with signature" >&2
+	echo "       -stable         Set GLUON_AUTOUPDATER_BRANCH=stable" >&2
 	echo "       -b              BROKEN=1" >&2
 	echo "       -v              verbose" >&2
 	echo "       -j JOBS         Run build with -jJOBS. Default: ${proc}" >&2
@@ -40,6 +41,10 @@ while [ $# -gt 0 ]; do
 			signature="$2"
 			shift
 			;;
+		-stable)
+			export GLUON_AUTOUPDATER_BRANCH=stable
+			shift
+			;;
 		-b)
 			export BROKEN=1
 			;;
@@ -74,11 +79,11 @@ announce FFHH SITE PATH: "$site_path" >&2
 pushd "$site_path"
 # shellcheck source=/dev/null
 . ./build.conf
-[ "${GLUON_BRANCH}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp$(date +%Y%m%d)"
+[ "${GLUON_AUTOUPDATER_BRANCH:-experimental}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp$(date +%Y%m%d)"
 export GLUON_RELEASE
-export GLUON_BRANCH
+export GLUON_AUTOUPDATER_BRANCH
 export GLUON_SITEDIR="${site_path}"
-export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_BRANCH}"
+export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_AUTOUPDATER_BRANCH}"
 popd
 
 pushd "${gluon_path}"
@@ -120,7 +125,7 @@ done
 announce Building manifest...
 make manifest
 if [ -n "${signature}" ]; then
-	if [ "$GLUON_BRANCH" == "experimental" ]; then
+	if [ "$GLUON_AUTOUPDATER_BRANCH" == "experimental" ]; then
 		announce Signing...
 		"${gluon_path}/contrib/sign.sh" "${signature}" "${GLUON_OUTPUTDIR}/images/sysupgrade/experimental.manifest"
 	else
diff --git a/site.mk b/site.mk
index 5952e73..2d6fb10 100644
--- a/site.mk
+++ b/site.mk
@@ -1,6 +1,8 @@
 GLUON_MULTIDOMAIN := 1
 GLUON_DEPRECATED := upgrade
 
+GLUON_AUTOUPDATER_ENABLED ?= 1
+
 GLUON_SITE_PACKAGES := \
 	-gluon-config-mode-geo-location \
 	-gluon-config-mode-contact-info \