--- a/jdk/make/src/classes/build/tools/module/ModuleArchive.java	Fri Dec 12 14:31:26 2014 +0100
+++ b/jdk/make/src/classes/build/tools/module/ModuleArchive.java	Fri Dec 12 15:35:21 2014 +0100
@@ -227,10 +227,12 @@
 
         private static String nativeDir(String filename) {
             if (System.getProperty("os.name").startsWith("Windows")) {
-                if (filename.endsWith(".dll"))
+                if (filename.endsWith(".dll") || filename.endsWith(".diz")
+                    || filename.endsWith(".pdb") || filename.endsWith(".map")) {
                     return "bin";
-                 else
+                } else {
                     return "lib";
+                }
             } else {
                 return "lib";
             }