diff --git a/fs/shm/CMakeLists.txt b/fs/shm/CMakeLists.txt
index d76fb17e3b..d6770ea4f1 100644
--- a/fs/shm/CMakeLists.txt
+++ b/fs/shm/CMakeLists.txt
@@ -20,6 +20,6 @@
 
 # Include POSIX message queue support
 
-if(CONFIG_FS_SHM)
+if(CONFIG_FS_SHMFS)
   target_sources(fs PRIVATE shm_open.c shm_unlink.c shmfs.c shmfs_alloc.c)
 endif()
diff --git a/fs/shm/Kconfig b/fs/shm/Kconfig
index 7ec28209a0..77bdbe5a32 100644
--- a/fs/shm/Kconfig
+++ b/fs/shm/Kconfig
@@ -19,4 +19,4 @@ config FS_SHMFS_VFS_PATH
 		The path to where shared memory objects will exist in the VFS
 		namespace.
 
-endif # FS_SHM
+endif # FS_SHMFS
diff --git a/fs/vfs/fs_stat.c b/fs/vfs/fs_stat.c
index e6acc39858..74984fb300 100644
--- a/fs/vfs/fs_stat.c
+++ b/fs/vfs/fs_stat.c
@@ -278,7 +278,7 @@ int inode_stat(FAR struct inode *inode, FAR struct stat *buf, int resolve)
     }
   else
 #endif
-#if defined(CONFIG_FS_SHM)
+#if defined(CONFIG_FS_SHMFS)
   /* Check for shared memory */
 
   if (INODE_IS_SHM(inode))