diff --git a/scripts/dpm.sh b/scripts/dpm.sh
index d60c2571..38ba1728 100644
--- a/scripts/dpm.sh
+++ b/scripts/dpm.sh
@@ -1,21 +1,5 @@
 #!/bin/sh
 
-myname=`basename $0`
-dpkg=/usr/bin/dpkg
-
-usage()
-{
-	echo "usage: $myname [-h] [... misc rpm options]"
-	[ "$1" ] && exit $1
-
-}
-
-fatal()
-{
-	echo $@ >&2
-	exit 1
-}
-
 cmd_install()
 {
 	local n=`basename $1`
@@ -46,7 +30,7 @@ cmd_query()
 	}
 
 	local p=`echo $1 | sed 's/-[0-9.-]\+$//'`
-	local v=`echo $1 | sed "s/$p-*//"`
+	local v=`echo $1 | sed "s/^$p-*//"`
 	local ip=`dpkg-query -W -f '${Package}' $p >/dev/null 2>&1`
 	[ $? != 0 -o -z "$ip" ] && exit 1
 	local iv=`dpkg-query -W -f '${Version}' $p >/dev/null 2>&1`
@@ -60,10 +44,25 @@ cmd_query()
 	return 0
 }
 
-set -- `getopt hqiUe "$@"`
+usage()
+{
+	echo "usage: $myname [-h] [... misc rpm options]"
+	[ "$1" ] && exit $1
 
+}
+
+fatal()
+{
+	echo $@ >&2
+	exit 1
+}
+
+# -- here we go
+myname=`basename $0`
+dpkg=/usr/bin/dpkg
 cmd=""
 
+set -- `getopt hqiUe "$@"`
 while [ "$1" != -- ]; do
 case $1 in
 	-h)