diff --git a/documentation/wine.man b/documentation/wine.man
index 3abc7c14dd0..121c1a025d7 100644
--- a/documentation/wine.man
+++ b/documentation/wine.man
@@ -311,11 +311,22 @@ number.
 .PP
 .I format: Filesystem = <fstype>
 .br
-default: unix
+default: win95
 .br
-Used to specify the type of the filesystem on which the drive resides;
-supported types are msdos (or fat), win95 (or vfat), unix. If the
-drive spans several different filesystems, say unix.
+Used to specify the type of the file system Wine should emulate on a given
+directory structure/underlying file system.
+.br
+Supported types are msdos (or fat), win95 (or vfat), unix.
+.br
+Recommended:
+.br
+  win95 for ext2fs, VFAT and FAT32
+.br
+  msdos for FAT16 (ugly)
+.br
+You definitely don't want to use "unix" unless you intend to port programs using Winelib.
+.br
+Always try to avoid using FAT16. Use VFAT/FAT32 OS file system driver instead !
 .PP
 .B [wine]
 .br
diff --git a/files/drive.c b/files/drive.c
index c78c8ac8552..364222a64dc 100644
--- a/files/drive.c
+++ b/files/drive.c
@@ -120,9 +120,9 @@ static UINT32 DRIVE_GetFSFlags( const char *name, const char *value )
 
     for (descr = DRIVE_Filesystems; descr->name; descr++)
         if (!strcasecmp( value, descr->name )) return descr->flags;
-    MSG("%s: unknown filesystem type '%s', defaulting to 'unix'.\n",
+    MSG("%s: unknown filesystem type '%s', defaulting to 'win95'.\n",
 	name, value );
-    return DRIVE_CASE_SENSITIVE | DRIVE_CASE_PRESERVING;
+    return DRIVE_CASE_PRESERVING;
 }
 
 
@@ -184,7 +184,7 @@ int DRIVE_Init(void)
             drive->serial = strtoul( buffer, NULL, 16 );
 
             /* Get the filesystem type */
-            PROFILE_GetWineIniString( name, "Filesystem", "unix",
+            PROFILE_GetWineIniString( name, "Filesystem", "win95",
                                       buffer, sizeof(buffer) );
             drive->flags = DRIVE_GetFSFlags( name, buffer );
 
diff --git a/wine.ini b/wine.ini
index 9c7a69fda7d..81410a7195a 100644
--- a/wine.ini
+++ b/wine.ini
@@ -8,6 +8,12 @@
 ;; Label=xxx      (drive label, at most 11 characters)
 ;; Serial=xxx     (serial number, 8 characters hexadecimal number)
 ;; Filesystem=xxx (supported types are 'msdos','win95','unix')
+;;   This is the FS Wine is supposed to emulate on a certain
+;;   directory structure.
+;;   Recommended:
+;;   - "win95" for ext2fs, VFAT and FAT32
+;;   - "msdos" for FAT16 (ugly, upgrading to VFAT driver strongly recommended)
+;;   DON'T use "unix" unless you intend to port programs using Winelib !
 ;; Device=/dev/xx (only if you want to allow raw device access)
 ;;
 [Drive A]
@@ -21,23 +27,25 @@ Device=/dev/fd0
 Path=/c
 Type=hd
 Label=MS-DOS
-Filesystem=msdos
+Filesystem=win95
 
 [Drive D]
 Path=/cdrom
 Type=cdrom
 Label=CD-Rom
+Filesystem=win95
 
 [Drive E]
 Path=/tmp
 Type=hd
 Label=Tmp Drive
+Filesystem=win95
 
 [Drive F]
 Path=${HOME}
 Type=network
 Label=Home
-Filesystem=unix
+Filesystem=win95
 
 [wine]
 Windows=c:\windows