diff --git a/misc/usb_add_change b/misc/usb_add_change
index e01f362..56cde28 100755
--- a/misc/usb_add_change
+++ b/misc/usb_add_change
@@ -8,10 +8,11 @@
 ## running in dom0.
 ##
 
-# FIXME: Ignore USB hubs.
+# FIXME: Ignore USB hubs and other wierd devices.
 [ "$DEVNUM" = "001" ] && exit 0
+[ "$DEVTYPE" != "usb_device" ] && exit 0
 
-NAME="${BUSNUM}/${DEVNUM}"
+NAME=`basename ${DEVPATH}`
 # FIXME: For some devices (my Cherry keyboard) ID_SERIAL does not
 # contain proper human-readable name, should find better method to
 # build devide description.
diff --git a/misc/usb_remove b/misc/usb_remove
index 5598849..926dc6f 100755
--- a/misc/usb_remove
+++ b/misc/usb_remove
@@ -3,7 +3,7 @@
 # FIXME: Ignore USB hubs.
 [ "$DEVNUM" = "001" ] && exit 0
 
-NAME="${BUSNUM}/${DEVNUM}"
+NAME=`basename ${DEVPATH}`
 XS_KEY="qubes-usb-devices/$NAME"
 
 xenstore-rm "$XS_KEY"