--- old/src/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java	2012-11-30 08:17:27.196664332 -0800
+++ new/src/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java	2012-11-30 08:17:26.944790339 -0800
@@ -29,6 +29,8 @@
 import java.nio.file.attribute.*;
 import java.nio.file.spi.FileTypeDetector;
 import java.io.IOException;
+import java.security.AccessController;
+import sun.security.action.GetPropertyAction;
 
 /**
  * Solaris implementation of FileSystemProvider
@@ -83,6 +85,13 @@
 
     @Override
     FileTypeDetector getFileTypeDetector() {
-        return new GnomeFileTypeDetector();
+        final Path userMimeTypes = Paths.get(AccessController.doPrivileged(
+                new GetPropertyAction("user.home")), ".mime.types");
+
+        final Path sysMimeTypes = Paths.get("/etc/mime.types");
+        
+        return chain(new GnomeFileTypeDetector(),
+                new MimeTypesFileTypeDetector(userMimeTypes),
+                new MimeTypesFileTypeDetector(sysMimeTypes));
     }
 }