diff --git a/ntfsprogs/mkntfs.8.in b/ntfsprogs/mkntfs.8.in
index 1fe7e41e..9560f9c9 100644
--- a/ntfsprogs/mkntfs.8.in
+++ b/ntfsprogs/mkntfs.8.in
@@ -4,7 +4,7 @@
 .\"
 .TH MKNTFS 8 "2005\-11\-21" "ntfsprogs version @VERSION@"
 .SH NAME
-mkntfs \- create an NTFS 1.2 (Windows NT/2000/XP) file system
+mkntfs \- create an NTFS file system
 .SH SYNOPSIS
 .B mkntfs
 [\fIoptions\fR] \fIdevice \fR[\fInumber\-of\-sectors\fR]
@@ -87,8 +87,8 @@ mkntfs \- create an NTFS 1.2 (Windows NT/2000/XP) file system
 ]
 .SH DESCRIPTION
 .B mkntfs
-is used to create an NTFS 1.2 (Windows NT 4.0) file system on a device (usually
-a disk partition).
+is used to create an NTFS file system on a device (usually a disk partition)
+or file.
 .I device
 is the special file corresponding to the device (e.g
 .IR /dev/hdXX ).
@@ -147,10 +147,13 @@ greater than 4096 have the side effect that compression is disabled on the
 volume (due to limitations in the NTFS compression algorithm currently in use
 by Windows).
 .TP
-\fB\-I\fR, \fB\-\-no\-indexing\fR
-Disable content indexing on the volume. (This is only meaningful on
-Windows 2000 and later. Windows NT 4.0 and earlier ignore this as they do
-not implement content indexing at all.)
+\fB\-N\fR, \fB\-\-ntfs\-version\fR STRING
+Select the version of NTFS you wish to create.  This can be "1.2" 
+(Windows NT 4.0) or "3.1" (Windows XP, Server 2003 and Vista). 
+Versions are upwards compatible and Windows 2000, which uses version "3.0",
+can read/write both.
+
+If this option is omitted then version "1.2" is used.
 .TP
 \fB\-n\fR, \fB\-\-no\-action\fR
 Causes
@@ -160,10 +163,6 @@ to create a filesystem. All steps of the format are carried out except the
 actual writing to the device.
 .SS Advanced options
 .TP
-\fB\-N\fR, \fB\-\-ntfs\-version\fR STRING
-Select the version of NTFS you wish to use.  This can be one of "1.2", "3.0",
-or "3.1".
-.TP
 \fB\-s\fR, \fB\-\-sector\-size\fR BYTES
 Specify the size of sectors in bytes. Valid sector size values are 256, 512,
 1024, 2048 and 4096 bytes per sector. If omitted,
@@ -229,6 +228,11 @@ multiplier	(% of volume size)
 Fake the time to be 00:00:00 UTC, Jan 1, 1970 instead of the current system
 time.  This is only really useful for debugging purposes.
 .TP
+\fB\-I\fR, \fB\-\-no\-indexing\fR
+Disable content indexing on the volume. (This is only meaningful on
+Windows 2000 and later. Windows NT 4.0 and earlier ignore this as they do
+not implement content indexing at all.)
+.TP
 \fB\-F\fR, \fB\-\-force\fR
 Force
 .B mkntfs
diff --git a/ntfsprogs/mkntfs.c b/ntfsprogs/mkntfs.c
index 9c10739a..a8f7c51b 100644
--- a/ntfsprogs/mkntfs.c
+++ b/ntfsprogs/mkntfs.c
@@ -6,7 +6,7 @@
  * Copyright (c) 2002-2006 Szabolcs Szakacsits
  * Copyright (c) 2005      Erik Sornes
  *
- * This utility will create an NTFS 1.2, 3.0 or 3.1 volume on a user
+ * This utility will create an NTFS 1.2 or 3.1 volume on a user
  * specified (block) device.
  *
  * Some things (option handling and determination of mount status) have been
@@ -432,10 +432,12 @@ static BOOL mkntfs_parse_options(int argc, char *argv[], struct mkntfs_options *
 				if (strcmp(optarg , "1.2") == 0) {
 					opts2->ver_major = 1;
 					opts2->ver_minor = 2;
+/*
+				FIXME: version 3.0 was not checked
 				} else if (strcmp(optarg , "3.0") == 0) {
 					opts2->ver_major = 3;
 					opts2->ver_minor = 0;
-				} else if (strcmp(optarg , "3.1") == 0) {
+*/				} else if (strcmp(optarg , "3.1") == 0) {
 					opts2->ver_major = 3;
 					opts2->ver_minor = 1;
 				} else {