diff --git a/package/gluon-core/Makefile b/package/gluon-core/Makefile
index 93b2d599b4f24a57fb3b19f944d062d8527f7539..867a52aa5a295b6cd47564f98a3b8d693d60ce0d 100644
--- a/package/gluon-core/Makefile
+++ b/package/gluon-core/Makefile
@@ -11,7 +11,7 @@ define Package/gluon-core
   TITLE:=Base files of Gluon
   DEPENDS:= \
 	+gluon-site +libgluonutil +libiwinfo-lua +lua-platform-info +lua-simple-uci +lua-hash +lua-jsonc \
-	+luabitop +luaposix +vxlan +odhcp6c +firewall +pretty-hostname
+	+lua-bit32 +luaposix +vxlan +odhcp6c +firewall +pretty-hostname
 endef
 
 define Package/gluon-core/description
diff --git a/package/gluon-core/luasrc/usr/lib/lua/gluon/iputil.lua b/package/gluon-core/luasrc/usr/lib/lua/gluon/iputil.lua
index 266ede38fde6770b607e854f255520e0292f5565..e2c37cfd34279be16f5c7ce3305538ec418a92ac 100644
--- a/package/gluon-core/luasrc/usr/lib/lua/gluon/iputil.lua
+++ b/package/gluon-core/luasrc/usr/lib/lua/gluon/iputil.lua
@@ -1,4 +1,4 @@
-local bit = require 'bit'
+local bit = require 'bit32'
 
 
 local M = {}
diff --git a/package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua b/package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua
index 8b5e7c4bf1afd30899401fca6679201ffe492328..e5d8052e53ebc6ccd5d1d9bcbf3afb3fe4e8a5a3 100644
--- a/package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua
+++ b/package/gluon-core/luasrc/usr/lib/lua/gluon/util.lua
@@ -1,4 +1,4 @@
-local bit = require 'bit'
+local bit = require 'bit32'
 local posix_fcntl = require 'posix.fcntl'
 local posix_glob = require 'posix.glob'
 local posix_syslog = require 'posix.syslog'
diff --git a/package/gluon-hoodselector/Makefile b/package/gluon-hoodselector/Makefile
index 9706a605836ce03b1548ffd5d325aece69082a93..e0dbf46fa0e19e209c387e375f94d4154b8765eb 100644
--- a/package/gluon-hoodselector/Makefile
+++ b/package/gluon-hoodselector/Makefile
@@ -6,7 +6,7 @@ include ../gluon.mk
 
 define Package/gluon-hoodselector
   TITLE:=Automatically migrate nodes between domains.
-  DEPENDS:=+luaposix +libgluonutil +lua-math-polygon +libjson-c +gluon-site +micrond +luabitop @GLUON_MULTIDOMAIN
+  DEPENDS:=+luaposix +libgluonutil +lua-math-polygon +libjson-c +gluon-site +micrond +lua-bit32 @GLUON_MULTIDOMAIN
   CONFLICTS:=+gluon-config-mode-domain-select
 endef
 
diff --git a/package/gluon-hoodselector/luasrc/usr/sbin/hoodselector b/package/gluon-hoodselector/luasrc/usr/sbin/hoodselector
index 1183584c691bfa007802078395c3d6f020a97a9e..808d90d5aaa8914f0d5d246767103bcc8dcf5786 100755
--- a/package/gluon-hoodselector/luasrc/usr/sbin/hoodselector
+++ b/package/gluon-hoodselector/luasrc/usr/sbin/hoodselector
@@ -1,6 +1,6 @@
 #!/usr/bin/lua
 
-local bit = require('bit')
+local bit = require('bit32')
 local util = require ('gluon.util')
 local unistd = require('posix.unistd')
 local fcntl = require('posix.fcntl')
diff --git a/package/gluon-mesh-babel/Makefile b/package/gluon-mesh-babel/Makefile
index 239d7132fe610b3d71f74ee7cd874cc17acb3b08..61eaff38f954fbc567503df7e703bd895625dc85 100644
--- a/package/gluon-mesh-babel/Makefile
+++ b/package/gluon-mesh-babel/Makefile
@@ -9,7 +9,7 @@ include ../gluon.mk
 
 define Package/gluon-mesh-babel
   TITLE:=Babel mesh
-  DEPENDS:=+gluon-core +babeld +gluon-mesh-layer3-common +libiwinfo +libgluonutil +firewall +libjson-c +libnl-tiny +libubus +libubox +libblobmsg-json +libbabelhelper +luabitop
+  DEPENDS:=+gluon-core +babeld +gluon-mesh-layer3-common +libiwinfo +libgluonutil +firewall +libjson-c +libnl-tiny +libubus +libubox +libblobmsg-json +libbabelhelper
   PROVIDES:=gluon-mesh-provider
 endef