diff -urNad hplip-3.11.3a-orig/prnt/drv/hpcups.drv.in hplip-3.11.3a/prnt/drv/hpcups.drv.in
--- hplip-3.11.3a-orig/prnt/drv/hpcups.drv.in	2011-05-14 17:52:36.000000000 +0600
+++ hplip-3.11.3a/prnt/drv/hpcups.drv.in	2011-05-14 17:53:16.000000000 +0600
@@ -13504,7 +13504,7 @@
     Choice "DraftRGB/Draft Color" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(-1)/cupsString0(PlainDraftColor)/HWResolution[300 300]>>setpagedevice"
     Choice "DraftGray/Draft Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2/OutputType(-1)/cupsString0(PlainDraftGrayK)/HWResolution[300 300]>>setpagedevice"
     //Choice "BestGray/Best Grayscale" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 2/cupsCompression 2/HWResolution[600 600]>>setpagedevice"  // black only
-    Choice "Photo/High-Resolution Photo" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(2)/cupsString0(PhotoBestColor)/HWResolution[600 600]>>setpagedevice"
+    Choice "Photo/High-Resolution Photo" "<</cupsColorSpace 1/cupsBitsPerColor 8/cupsRowStep 0/OutputType(1)/cupsString0(PhotoBestColor)/HWResolution[600 600]>>setpagedevice"
 
   // Constraints
   UIConstraints "*MediaType Glossy *OutputMode DraftGray"
diff -urNad hplip-3.11.3a-orig/prnt/hpcups/dj8x5PrintModes.h hplip-3.11.3a/prnt/hpcups/dj8x5PrintModes.h
--- hplip-3.11.3a-orig/prnt/hpcups/dj8x5PrintModes.h	2011-05-14 17:52:37.000000000 +0600
+++ hplip-3.11.3a/prnt/hpcups/dj8x5PrintModes.h	2011-05-14 18:08:12.000000000 +0600
@@ -21,7 +21,7 @@
         "PlainNormalColor",
         {600, 300, 300, 300, 300, 300},
         {600, 300, 300, 300, 300, 300},
-        {1, 1, 1, 1, 1, 1}, 4, FED,
+        {1, 2, 2, 2, 2, 2}, 4, FED,
         {ulMapDJ895_KCMY, NULL, NULL},
         300, 300, true, HTBinary_open, HT300x3004level_open
     },
@@ -31,7 +31,7 @@
         {600, 300, 300, 300, 300, 300},
         {1, 1, 1, 1, 1, 1}, 1, FED,
         {ulMapGRAY_K_6x6x1, NULL, NULL},
-        300, 300, false, HTBinary_open, HTBinary_open
+        600, 600, false, HTBinary_open, HTBinary_open
     },
     {
         "PlainNormalCMY",
@@ -47,7 +47,7 @@
         {600, 600, 600, 600, 600, 600},
         {1, 2, 2, 2, 2, 2}, 4, FED,
         {ulMapDJ895_HB_KCMY, NULL, NULL},
-        300, 300, false, HTBinary_open, HT600x6004level895_open
+        600, 600, false, HTBinary_open, HT600x6004level895_open
     },
     {
         "PhotoBestCMY",
@@ -55,7 +55,7 @@
         {600, 600, 600, 600, 600, 600},
         {1, 2, 2, 2, 2, 2}, 3, FED,
         {ulMapDJ895_HB_KCMY, NULL, NULL},
-        300, 300, false, HTBinary_open, HT600x6004level895_open
+        600, 600, false, HTBinary_open, HT600x6004level895_open
     },
     {
         "PlainDraftCMY",