diff --git a/reactos/base/system/format/CMakeLists.txt b/reactos/base/system/format/CMakeLists.txt
index d54a55a8d81..0907bc0490a 100644
--- a/reactos/base/system/format/CMakeLists.txt
+++ b/reactos/base/system/format/CMakeLists.txt
@@ -1,5 +1,7 @@
 
 add_executable(format format.c format.rc)
 set_module_type(format win32cui)
+set_target_properties(format PROPERTIES SUFFIX ".com")
+
 add_importlibs(format user32 fmifs msvcrt kernel32 ntdll)
 add_cd_file(TARGET format DESTINATION reactos/system32 FOR all)
diff --git a/reactos/base/system/format/format.rc b/reactos/base/system/format/format.rc
index 6d314033fa1..3731781c989 100644
--- a/reactos/base/system/format/format.rc
+++ b/reactos/base/system/format/format.rc
@@ -2,9 +2,9 @@
 
 #include "resource.h"
 
-#define REACTOS_STR_FILE_DESCRIPTION  "Formating a device with a filesystem"
+#define REACTOS_STR_FILE_DESCRIPTION  "Disk Format Utility"
 #define REACTOS_STR_INTERNAL_NAME     "format"
-#define REACTOS_STR_ORIGINAL_FILENAME "format.exe"
+#define REACTOS_STR_ORIGINAL_FILENAME "format.com"
 #include <reactos/version.rc>
 
 /* UTF-8 */
diff --git a/rosapps/applications/sysutils/man/man/2/format.man b/rosapps/applications/sysutils/man/man/2/format.man
index ec3da7ba178..0ed1dea90e8 100644
--- a/rosapps/applications/sysutils/man/man/2/format.man
+++ b/rosapps/applications/sysutils/man/man/2/format.man
@@ -1,22 +1,22 @@
-[]=================================[format.exe]==============================[]
+[]=================================[format.com]==============================[]
 
 Author:      Mark Russinovich
-Purpose:     Disk formating tool
+Purpose:     Disk Format Utility
 Port on ROS: Emanuele Aliberti
 License:     GPL
 
-Usage: format.exe drive: [-FS:file-system] [-V:label] [-Q] [-A:size] [-C]
+Usage: format.com drive: [-FS:file-system] [-V:label] [-Q] [-A:size] [-C]
 
   [drive:]         Specifies the drive to format.
   -FS:file-system  Specifies the type of file system (e.g. FAT).
   -V:label         Specifies volume label.
   -Q               Performs a quick format.
   -A:size          Overrides the default allocation unit size. 
-		   Default settings are strongly recommended for general
-		   use NTFS supports 512, 1024, 2048, 4096, 8192, 16K, 
-		   32K, 64K. FAT supports 8192, 16K, 32K, 64K, 128K, 256K.
+                   Default settings are strongly recommended for general
+                   use NTFS supports 512, 1024, 2048, 4096, 8192, 16K, 
+                   32K, 64K. FAT supports 8192, 16K, 32K, 64K, 128K, 256K.
                    NTFS compression is not supported for allocation 
-	           unit sizes above 4096.
+                   unit sizes above 4096.
   -C               Files created on the new volume will be compressed by
                    default.