diff --git a/jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintService.java b/jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintService.java
index 3bfb7577e8e..20a3db38b36 100644
--- a/jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintService.java
+++ b/jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintService.java
@@ -283,7 +283,16 @@ public class PSStreamPrintService extends StreamPrintService
         } else if (category == OrientationRequested.class) {
             if (flavor == null ||
                 flavor.equals(DocFlavor.SERVICE_FORMATTED.PAGEABLE) ||
-                flavor.equals(DocFlavor.SERVICE_FORMATTED.PRINTABLE)) {
+                flavor.equals(DocFlavor.SERVICE_FORMATTED.PRINTABLE) ||
+                flavor.equals(DocFlavor.INPUT_STREAM.GIF) ||
+                flavor.equals(DocFlavor.INPUT_STREAM.JPEG) ||
+                flavor.equals(DocFlavor.INPUT_STREAM.PNG) ||
+                flavor.equals(DocFlavor.BYTE_ARRAY.GIF) ||
+                flavor.equals(DocFlavor.BYTE_ARRAY.JPEG) ||
+                flavor.equals(DocFlavor.BYTE_ARRAY.PNG) ||
+                flavor.equals(DocFlavor.URL.GIF) ||
+                flavor.equals(DocFlavor.URL.JPEG) ||
+                flavor.equals(DocFlavor.URL.PNG)) {
                 OrientationRequested []arr = new OrientationRequested[3];
                 arr[0] = OrientationRequested.PORTRAIT;
                 arr[1] = OrientationRequested.LANDSCAPE;
diff --git a/jdk/test/javax/print/attribute/TestOrientationSupportForStreamPrnSrv.java b/jdk/test/javax/print/attribute/TestOrientationSupportForStreamPrnSrv.java
new file mode 100644
index 00000000000..1817804c369
--- /dev/null
+++ b/jdk/test/javax/print/attribute/TestOrientationSupportForStreamPrnSrv.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+/*
+ * @test
+ * @bug 4882305
+ * @summary  Verifies if StreamPrintServ.getSupportedAttributeValues returns
+ *           valid Orientation attribute and not null for image/jpeg DocFlavor.
+ * @run main TestOrientationSupportForStreamPrnSrv
+ */
+import java.io.File;
+import java.io.FileOutputStream;
+import javax.print.DocFlavor;
+import javax.print.PrintService;
+import javax.print.PrintServiceLookup;
+import javax.print.StreamPrintServiceFactory;
+import javax.print.attribute.standard.OrientationRequested;
+
+public class TestOrientationSupportForStreamPrnSrv {
+
+    public static void main(java.lang.String[] args) throws Exception {
+        PrintService service = null;
+        PrintService defService = PrintServiceLookup.lookupDefaultPrintService();
+        File f = null;
+        FileOutputStream fos = null;
+        String mType = "application/postscript";
+        DocFlavor flavors[] = null;
+
+        f = new File("streamexample1.ps");
+        fos = new FileOutputStream(f);
+        StreamPrintServiceFactory[] factories = StreamPrintServiceFactory.
+                lookupStreamPrintServiceFactories(DocFlavor.INPUT_STREAM.JPEG,
+                        mType);
+        if (factories.length > 0) {
+            System.out.println("output format "+factories[0].getOutputFormat());
+            service = factories[0].getPrintService(fos);
+            flavors = factories[0].getSupportedDocFlavors();
+        }
+        System.out.println("Stream Print Service "+service);
+
+        if (service == null) {
+            throw new RuntimeException("No Stream Print Service found");
+        }
+        System.out.println("is OrientationRequested supported? "+
+                service.isAttributeCategorySupported(OrientationRequested.class));
+
+        for (int k = 0; k < flavors.length; k ++) {
+            Object obj = service.getSupportedAttributeValues(OrientationRequested.class,
+                    flavors[k], null);
+            if (flavors[k].equals(DocFlavor.INPUT_STREAM.JPEG)) {
+                if (obj == null) {
+                    throw new RuntimeException(""
+                            + "StreamPrintServ.getSupportedAttributeValues "
+                            + "returns null for image/jpeg DocFlavor for "
+                            + "supported Orientation category");
+                }
+            }
+        }
+    }
+}
+