--- old/src/java.datatransfer/macosx/classes/sun/datatransfer/resources/flavormap.properties	2015-09-30 13:55:18.000000000 +0300
+++ new/src/java.datatransfer/macosx/classes/sun/datatransfer/resources/flavormap.properties	2015-09-30 13:55:18.000000000 +0300
@@ -66,7 +66,6 @@
 TEXT=text/plain;eoln="\n";terminators=0
 STRING=text/plain;charset=UTF-8;eoln="\n";terminators=0
 FILE_NAME=application/x-java-file-list;class=java.util.List
-text/uri-list=application/x-java-file-list;class=java.util.List
 PNG=image/x-java-image;class=java.awt.Image
 JFIF=image/x-java-image;class=java.awt.Image
 TIFF=image/x-java-image;class=java.awt.Image
@@ -74,3 +73,4 @@
 HTML=text/html;charset=utf-8;eoln="\r\n";terminators=1
 URL=application/x-java-url;class=java.net.URL,\
     text/uri-list;eoln="\r\n";terminators=1
+XPICT=image/x-pict;class=java.io.InputStream
--- old/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDataTransferer.java	2015-09-30 13:55:19.000000000 +0300
+++ new/src/java.desktop/macosx/classes/sun/lwawt/macosx/CDataTransferer.java	2015-09-30 13:55:19.000000000 +0300
@@ -54,7 +54,8 @@
         "PDF",
         "URL",
         "PNG",
-        "JFIF"
+        "JFIF",
+        "XPICT"
     };
 
     static {
@@ -78,6 +79,7 @@
     public static final int CF_URL         = 7;
     public static final int CF_PNG         = 8;
     public static final int CF_JPEG        = 9;
+    public static final int CF_XPICT       = 10;
 
     private CDataTransferer() {}
 
--- old/src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.m	2015-09-30 13:55:19.000000000 +0300
+++ new/src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.m	2015-09-30 13:55:19.000000000 +0300
@@ -56,6 +56,8 @@
                               forKey:[NSNumber numberWithLong:sun_lwawt_macosx_CDataTransferer_CF_PNG]];
         [sStandardMappings setObject:(NSString*)kUTTypeJPEG
                               forKey:[NSNumber numberWithLong:sun_lwawt_macosx_CDataTransferer_CF_JPEG]];
+        [sStandardMappings setObject:NSPICTPboardType
+                                       forKey:[NSNumber numberWithLong:sun_lwawt_macosx_CDataTransferer_CF_XPICT]];
     }
     return sStandardMappings;
 }