diff --git a/scripts/dpm.sh b/scripts/dpm.sh
index ed25104c..70a57a4d 100644
--- a/scripts/dpm.sh
+++ b/scripts/dpm.sh
@@ -103,6 +103,9 @@ cmd_query()
 		a)
 			$dpkg -l $1
 			;;
+		-X-show-name-version)
+			dpkg-query --showformat="$1-\${Version}\n" --show $1
+			;;
 		esac
 		done
 		return $?
@@ -141,7 +144,7 @@ myname=`basename $0`
 dpkg=log_dpkg
 cmd=""
 
-set -- `getopt hqiUeVfapl "$@"`
+set -- `getopt hqiUeVfapl -l "nodeps,all-matches" "$@"`
 while [ "$1" != -- ]; do
 case $1 in
 	-h)
@@ -182,7 +185,8 @@ shift
 done
 shift
 
-# [ $# != 1 ] && usage 1
+[ "$cmd" = query -a -z "$query_cmds" ] && query_cmds="-X-show-name-version"
+
 [ "$cmd" ] || usage 1
 
 eval cmd_\$cmd $*