diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 81a77f8005a..41de3d4b213 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -37,6 +37,7 @@ option(NUTTX_INCLUDE_INCDIR "Build incdir" OFF)
 option(NUTTX_INCLUDE_MKCONFIG "Build mkconfig" OFF)
 option(NUTTX_INCLUDE_MKDEPS "Build mkdeps" OFF)
 option(NUTTX_INCLUDE_MKSYMTAB "Build mksymtab" OFF)
+option(NUTTX_INCLUDE_MKPASSWD "Build mkpasswd" OFF)
 option(NUTTX_INCLUDE_MKSYSCALL "Build mksyscall" OFF)
 option(NUTTX_INCLUDE_MKVERSION "Build mkversion" OFF)
 option(NUTTX_INCLUDE_NXSTYLE "Build nxstyle" OFF)
@@ -138,6 +139,15 @@ if(NUTTX_INCLUDE_ALL_TOOLS OR NUTTX_INCLUDE_MKDEPS)
   install(TARGETS mkdeps DESTINATION bin)
 endif()
 
+# ============================================================================
+# mkpasswd binaries Create the /etc/passwd entry
+# ============================================================================
+
+if(NUTTX_INCLUDE_ALL_TOOLS OR NUTTX_INCLUDE_MKPASSWD)
+  add_executable(mkpasswd mkpasswd.c)
+  install(TARGETS mkpasswd DESTINATION bin)
+endif()
+
 # ============================================================================
 # mksyscall binaries Convert a CSV file into syscall stubs and proxies
 # ============================================================================