diff --git a/package/gluon-usteer/Makefile b/package/gluon-usteer/Makefile
new file mode 100644
index 00000000..82ceeb36
--- /dev/null
+++ b/package/gluon-usteer/Makefile
@@ -0,0 +1,12 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gluon-usteer
+
+include ../gluon.mk
+
+define Package/gluon-usteer
+  TITLE:=Gluon integration for the usteer daemon
+  DEPENDS:=+usteer
+endef
+
+$(eval $(call BuildPackageGluon,gluon-usteer))
diff --git a/package/gluon-usteer/README.md b/package/gluon-usteer/README.md
new file mode 100644
index 00000000..35ec657d
--- /dev/null
+++ b/package/gluon-usteer/README.md
@@ -0,0 +1,71 @@
+# ffda-gluon-usteer
+
+This package provides a Gluon-specific integration, the OpenWrt WiFi roaming & steering daemon.
+
+
+## Configuration
+
+This package provides a tiered configuration. It is hard to provide a configuration, which covers all possible deployment environments.
+
+The following configuration options can be configured using the site as well as the `gluon-usteer` configuration package.
+
+
+### network.enabled
+
+Default: 1
+
+Whether usteer contacts adjacent nodes using the mesh-interfaces.
+
+
+### network.wireless
+
+Default: 1
+
+Enabled networking with remote nodes using wireless mesh-interfaces.
+
+
+### network.wired
+
+Default: 1
+
+Enabled networking with remote nodes using wired mesh-interfaces.
+
+
+### network.update_interval
+
+Default: 5
+
+Interval (milliseconds) between node-updates sent.
+
+
+### network.update_timeout
+
+Default: 12
+
+Number of `network.update_interval` intervals after which a remote-node is deleted.
+
+
+### band_steering.enabled
+
+Default: 1
+
+Enables band-steering for clients connected on 2.4 GHz
+
+
+### band_steering.min_snr
+
+Default: -60
+
+Clients require to maintain a SNR / signal better than `band_steering.min_snr` to be steered to 5 GHz.
+
+
+### band_steering.interval
+
+Default: 40
+
+Clients require to maintain `band_steering.min_snr` for `band_steering.interval` milliseconds in order to be steered to 5GHz.
+
+
+## Site configuration
+
+The site configuration provides the site-wide default configuration for usteer.
diff --git a/package/gluon-usteer/check_site.lua b/package/gluon-usteer/check_site.lua
new file mode 100644
index 00000000..2534f67e
--- /dev/null
+++ b/package/gluon-usteer/check_site.lua
@@ -0,0 +1,14 @@
+-- Network
+
+need_boolean({'usteer', 'network', 'enabled'}, false)
+need_boolean({'usteer', 'network', 'wireless'}, false)
+need_boolean({'usteer', 'network', 'wired'}, false)
+need_number({'usteer', 'network', 'update_interval'}, false)
+need_number({'usteer', 'network', 'update_timeout'}, false)
+
+
+-- Band-Steering
+
+need_boolean({'usteer', 'band_steering', 'enabled'}, false)
+need_number({'usteer', 'band_steering', 'min_snr'}, false)
+need_number({'usteer', 'band_steering', 'interval'}, false)
diff --git a/package/gluon-usteer/files/etc/config/gluon-usteer b/package/gluon-usteer/files/etc/config/gluon-usteer
new file mode 100644
index 00000000..4f03320f
--- /dev/null
+++ b/package/gluon-usteer/files/etc/config/gluon-usteer
@@ -0,0 +1,3 @@
+config network network
+
+config band_steering band_steering
diff --git a/package/gluon-usteer/luasrc/lib/gluon/upgrade/750-gluon-usteer b/package/gluon-usteer/luasrc/lib/gluon/upgrade/750-gluon-usteer
new file mode 100755
index 00000000..d1b4d768
--- /dev/null
+++ b/package/gluon-usteer/luasrc/lib/gluon/upgrade/750-gluon-usteer
@@ -0,0 +1,109 @@
+#!/usr/bin/lua
+
+local uci = require('simple-uci').cursor()
+
+local wireless = require 'gluon.wireless'
+local site = require 'gluon.site'
+
+
+local defaults = {
+	["network"]={
+		["enabled"]=site.usteer.network.enabled(true),
+		["wireless"]=site.usteer.network.wireless(true),
+		["wired"]=site.usteer.network.wired(true),
+		["update_interval"]=site.usteer.network.update_interval(5000),
+		["update_timeout"]=site.usteer.network.update_timeout(12),
+	},
+	["band_steering"]={
+		["enabled"]=site.usteer.band_steering.enabled(true),
+		["min_snr"]=site.usteer.band_steering.min_snr(-60),
+		["interval"]=site.usteer.band_steering.interval(40000),
+	},
+}
+
+local function get_config(section, option)
+	local default = defaults[section][option]
+	local user = uci:get("gluon-usteer", section, option)
+
+	if user ~= nil and default == true or default == false then
+		user = uci:get_bool("gluon-usteer", section, option)
+	end
+
+	if user ~= nil then
+		return user
+	end
+
+	return default
+end
+
+local function set_config(config, section, option)
+	-- Get config
+	local conf_val = get_config(section, option)
+
+	if conf_val == nil then return end
+
+
+	uci:set('usteer', 'usteer', config, conf_val)
+end
+
+
+uci:delete_all('usteer', 'usteer')
+
+uci:section('usteer', 'usteer', 'usteer', {
+	syslog = 1,
+	ipv6 = 1,
+	debug_level = 2,
+})
+
+
+-- Band steering
+
+if not get_config('band_steering', 'enabled') then
+	uci:set('usteer', 'usteer', 'band_steering_interval', '0')
+else
+	set_config('band_steering_min_snr', 'band_steering', 'min_snr')
+	set_config('band_steering_interval', 'band_steering', 'interval')
+end
+
+
+-- Network
+
+uci:set('usteer', 'usteer', 'local_mode', not get_config('network', 'enabled'))
+
+set_config('remote_update_interval', 'network', 'update_interval')
+set_config('remote_node_timeout', 'network', 'update_timeout')
+
+local networks = {}
+
+if get_config('network', 'wireless') then
+	wireless.foreach_radio(uci, function(radio)
+		local radio_name = radio['.name']
+		table.insert(networks, 'mesh_' .. radio_name)
+	end)
+end
+
+if get_config('network', 'wired') then
+	local prefix = ''
+	if site.mesh.vxlan(true) then
+		prefix = 'vx_'
+	end
+	table.insert(networks, prefix .. 'mesh_lan')
+	table.insert(networks, prefix .. 'mesh_wan')
+end
+
+uci:set('usteer', 'usteer', 'network', networks)
+uci:save('usteer')
+
+
+-- Firewall
+
+uci:section('firewall', 'rule', 'mesh_usteer_ll', {
+	dest_port = 16720,
+	src = 'mesh',
+	name = 'mesh_usteer_ll',
+	src_ip = 'fe80::/64',
+	target = 'ACCEPT',
+	proto = 'udp',
+})
+
+uci:save('firewall')