diff --git a/scripts/dpm.sh b/scripts/dpm.sh
index b609d891..76561e73 100644
--- a/scripts/dpm.sh
+++ b/scripts/dpm.sh
@@ -59,10 +59,10 @@ cmd_query()
 	[ "$query_cmds" ] && {
 		local cmd installed
 		local id=name
-		if [ "`echo $query_cmds | sed 's/.*p.*//'`" ]; then
+		if echo $query_cmds | grep -q p; then
 			id=pkg
 			query_cmds=`echo $query_cmds | sed 's/p//'`
-		elif [ "`echo $query_cmds | sed 's/.*f.*//'`" ]; then
+		elif echo $query_cmds | grep -q f; then
 			id=file
 			query_cmds=`echo $query_cmds | sed 's/f//'`
 		fi
@@ -81,6 +81,18 @@ cmd_query()
 				$dpkg -S $1;;
 			esac
 			;;
+		l)
+			case $id in
+			file)
+				echo blah
+				#$dpkg -p $1;;
+				;;
+			name)
+				$dpkg -L $1;;
+			pkg)
+				$dpkg -c $1;;
+			esac
+			;;
 		a)
 			$dpkg -L $1
 			;;
@@ -122,7 +134,7 @@ myname=`basename $0`
 dpkg=log_dpkg
 cmd=""
 
-set -- `getopt hqiUeVfap "$@"`
+set -- `getopt hqiUeVfapl "$@"`
 while [ "$1" != -- ]; do
 case $1 in
 	-h)
@@ -132,16 +144,16 @@ case $1 in
 		[ "$cmd" ] && usage 1
 		cmd=query
 		;;
-	-V|-f|-a|-p)
+	-V|-f|-a|-p|-l)
 		[ "$cmd" ] && {
 			[ "$cmd" = query ] || usage 1
-			query_cmds="$cmd ${1:1:1}"
+			query_cmds="$query_cmds ${1:1:1}"
 		}
 		;;
 	-i)
 		[ "$cmd" ] && {
 			[ "$cmd" = query ] || usage 1
-			query_cmds="$cmd ${1:1:1}"
+			query_cmds="$query_cmds ${1:1:1}"
 			continue
 		}
 		cmd=install