diff --git a/usermngr/Makefile b/usermngr/Makefile
new file mode 100644
index 000000000..6dd150a41
--- /dev/null
+++ b/usermngr/Makefile
@@ -0,0 +1,55 @@
+#
+# Copyright (C) 2022 IOPSYS
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=usermngr
+PKG_VERSION:=1.0.0
+
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/usermngr.git
+PKG_SOURCE_VERSION:=c8afaf3a275d6a3480992a3769382135ca3252d7
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+MAKE_PATH:=src
+
+define Package/usermngr
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=TRx69
+  DEPENDS:= +shadow-utils
+  TITLE:=Package to add Device.Users. datamodel support
+endef
+
+define Package/usermngr/description
+  Package to add Device.Users. datamodel support
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ~/git/usermngr/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/usermngr/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/init.d/users $(1)/etc/init.d/users
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/uci-defaults/90-indicate-bootstrap $(1)/etc/uci-defaults/90-indicate-bootstrap
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/libusermngr.so $(1)/usr/lib/bbfdm/libusermngr.so
+	$(INSTALL_BIN) ./files/etc/config/users $(1)/etc/config/users
+endef
+
+$(eval $(call BuildPackage,usermngr))
diff --git a/usermngr/files/etc/config/users b/usermngr/files/etc/config/users
new file mode 100644
index 000000000..20eda1d5e
--- /dev/null
+++ b/usermngr/files/etc/config/users
@@ -0,0 +1,7 @@
+config user 'admin'
+        option enabled '1'
+        option remote_access '1'
+
+config user 'user'
+        option enabled '1'
+        option remote_access '1'