diff --git a/RICOH_Aficio_SP_204.ppd b/RICOH_Aficio_SP_204.ppd
index d4de0fe..1e19393 100644
--- a/RICOH_Aficio_SP_204.ppd
+++ b/RICOH_Aficio_SP_204.ppd
@@ -77,8 +77,9 @@
 *CloseUI: *MediaType
 *OpenUI *InputSlot/Media Source: PickOne
 *OrderDependency: 10 AnySetup *InputSlot
-*DefaultInputSlot: Auto
-*InputSlot Auto/Auto: "<</MediaPosition 0>>setpagedevice"
+*DefaultInputSlot: TRAY1
+*InputSlot MANUALFEED/Bypass Tray: "<</MediaPosition 0>>setpagedevice"
+*InputSlot TRAY1/Tray 1: "<</MediaPosition 1>>setpagedevice"
 *CloseUI: *InputSlot
 *OpenUI *Resolution/Resolution: PickOne
 *OrderDependency: 10 AnySetup *Resolution
diff --git a/pstoricohddst-gdi b/pstoricohddst-gdi
index 33f9156..f86f9b6 100755
--- a/pstoricohddst-gdi
+++ b/pstoricohddst-gdi
@@ -37,6 +37,7 @@ options="$5"
 
 pagesize="A4"
 resolution="600"
+mediasource="TRAY1"
 for opt in $options; do
 	case "$opt" in
 		PageSize=*)
@@ -45,6 +46,10 @@ for opt in $options; do
 	    	Resolution=*)
 		resolution=${opt#Resolution=}
 		resolution=${resolution%dpi}
+		;;
+		InputSlot=*)
+		mediasource=${opt#InputSlot=}
+		;;
 	esac
 done
 
@@ -104,7 +109,7 @@ EOF
 		cat <<EOF
 @PJL SET PAGESTATUS=START$e
 @PJL SET COPIES=1$e
-@PJL SET MEDIASOURCE=AUTO$e
+@PJL SET MEDIASOURCE=$mediasource$e
 @PJL SET MEDIATYPE=PLAINRECYCLE$e
 @PJL SET PAPER=$pagesize$e
 @PJL SET PAPERWIDTH=$xs$e
@@ -169,7 +174,7 @@ EOF
 		cat <<EOF
 @PJL SET PAGESTATUS=START$e
 @PJL SET COPIES=1$e
-@PJL SET MEDIASOURCE=AUTO$e
+@PJL SET MEDIASOURCE=$mediasource$e
 @PJL SET MEDIATYPE=PLAINRECYCLE$e
 @PJL SET PAPER=$pagesize$e
 @PJL SET PAPERWIDTH=$xs$e