diff --git a/recipes-core/images/netmodule-linux-image.bb b/recipes-core/images/netmodule-linux-image.bb
index 0f26958..da6d3b3 100644
--- a/recipes-core/images/netmodule-linux-image.bb
+++ b/recipes-core/images/netmodule-linux-image.bb
@@ -55,6 +55,7 @@ IMAGE_INSTALL_append = " \
                 ${FIRMWARE} \
                 wireless-regdb-static \
                 udev-rules-nmhw \
+                nmhw-fwupdate \
                 "
 
 IMAGE_INSTALL_append_am335x-nrhw16 = " \
diff --git a/recipes-core/nmhw-fwupdate/nmhw-fwupdate.bb b/recipes-core/nmhw-fwupdate/nmhw-fwupdate.bb
new file mode 100644
index 0000000..73a3137
--- /dev/null
+++ b/recipes-core/nmhw-fwupdate/nmhw-fwupdate.bb
@@ -0,0 +1,30 @@
+SUMMARY = "Generic NetModule Update tool"
+DESCRIPTION = "Generic NetModule update tool for firmware, bootloaders, etc"
+AUTHOR = "Alexandre Bard"
+
+SECTION = "core"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+
+SRC_URI =  " \
+    git://git.netmodule.intranet/nmos/nm-updater.git;user=gitea;protocol=ssh;user=gitea;protocol=ssh \
+    "
+SRCREV = "${AUTOREV}"
+
+S = "${WORKDIR}/git/src"
+
+FILES_${PN} = " \
+    /lib \
+    /usr \
+    "
+
+inherit allarch
+
+do_install () {
+    install -d ${D}/usr/bin
+    install -m 0755 nmhw-fwupdate.sh ${D}/usr/bin/nmhw-fwupdate
+    install -m 0755 list-devices.sh ${D}/usr/bin/list-devices
+
+    install -d ${D}/usr/lib
+    install -m 0755 lib-nmhw/* ${D}/usr/lib/
+}