diff --git a/view.sh b/view.sh
index c92f877f4..8eb31ca43 100755
--- a/view.sh
+++ b/view.sh
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # find jar-file with highest version number
-for i in `ls build/dist/poi-*.jar | grep -v -- "-sources" | grep -v -- "-examples" | grep -v -- "-excelant" | grep -v -- "-ooxml" | grep -v -- "-scratchpad" | grep -v -- "-javadoc"`;do
+for i in `ls build/dist/poi-*.jar | grep -v -- "-sources" | grep -v -- "-examples" | grep -v -- "-excelant" | grep -v -- "-ooxml" | grep -v -- "-javadoc"`;do
 	CP=$i:$CP
 done
 
@@ -13,4 +13,11 @@ fi
 
 echo Using jar $CP
 
-java -cp $CP org.apache.poi.hssf.dev.BiffViewer --escher "$@"
+file=$1
+echo Found extension ${file: -4}
+if [ ${file: -4} == ".doc" ]
+then
+	java -cp $CP org.apache.poi.hwpf.dev.HWPFLister "$@" --pictures --escher
+else
+	java -cp $CP org.apache.poi.hssf.dev.BiffViewer --escher "$@"
+fi