diff --git a/reactos/base/applications/cmdutils/mode/CMakeLists.txt b/reactos/base/applications/cmdutils/mode/CMakeLists.txt
index ed5689cdd3e..e03cde3e27c 100644
--- a/reactos/base/applications/cmdutils/mode/CMakeLists.txt
+++ b/reactos/base/applications/cmdutils/mode/CMakeLists.txt
@@ -1,5 +1,7 @@
 
 add_executable(mode mode.c mode.rc)
 set_module_type(mode win32cui)
+set_target_properties(mode PROPERTIES SUFFIX ".com")
+
 add_importlibs(mode user32 msvcrt kernel32)
 add_cd_file(TARGET mode DESTINATION reactos/system32 FOR all)
diff --git a/reactos/base/applications/cmdutils/mode/mode.rc b/reactos/base/applications/cmdutils/mode/mode.rc
index 60f7d212f14..33c5a85f202 100644
--- a/reactos/base/applications/cmdutils/mode/mode.rc
+++ b/reactos/base/applications/cmdutils/mode/mode.rc
@@ -1,5 +1,5 @@
 
 #define REACTOS_STR_FILE_DESCRIPTION    "ReactOS Mode Utility"
 #define REACTOS_STR_INTERNAL_NAME       "mode"
-#define REACTOS_STR_ORIGINAL_FILENAME   "mode.exe"
+#define REACTOS_STR_ORIGINAL_FILENAME   "mode.com"
 #include <reactos/version.rc>
diff --git a/reactos/base/applications/cmdutils/more/CMakeLists.txt b/reactos/base/applications/cmdutils/more/CMakeLists.txt
index f3d49efd5cc..28fab89b700 100644
--- a/reactos/base/applications/cmdutils/more/CMakeLists.txt
+++ b/reactos/base/applications/cmdutils/more/CMakeLists.txt
@@ -1,5 +1,7 @@
 
 add_executable(more more.c more.rc)
 set_module_type(more win32cui)
+set_target_properties(more PROPERTIES SUFFIX ".com")
+
 add_importlibs(more user32 msvcrt kernel32)
 add_cd_file(TARGET more DESTINATION reactos/system32 FOR all)
diff --git a/reactos/base/applications/cmdutils/more/more.rc b/reactos/base/applications/cmdutils/more/more.rc
index d44080075c6..4d04db0baf4 100644
--- a/reactos/base/applications/cmdutils/more/more.rc
+++ b/reactos/base/applications/cmdutils/more/more.rc
@@ -4,7 +4,7 @@
 
 #define REACTOS_STR_FILE_DESCRIPTION  "ReactOS More Command"
 #define REACTOS_STR_INTERNAL_NAME     "more"
-#define REACTOS_STR_ORIGINAL_FILENAME "more.exe"
+#define REACTOS_STR_ORIGINAL_FILENAME "more.com"
 #include <reactos/version.rc>
 
 /* UTF-8 */