diff --git a/misc/usb_add_change b/misc/usb_add_change
index a265900..4440475 100755
--- a/misc/usb_add_change
+++ b/misc/usb_add_change
@@ -12,7 +12,8 @@
 [ "$DEVNUM" = "001" ] && exit 0
 [ "$DEVTYPE" != "usb_device" ] && exit 0
 
-NAME=`basename ${DEVPATH}`
+# xenstore doesn't allow dot in key name
+NAME=`basename ${DEVPATH} | tr . _`
 # 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 926dc6f..f7f33ed 100755
--- a/misc/usb_remove
+++ b/misc/usb_remove
@@ -3,7 +3,7 @@
 # FIXME: Ignore USB hubs.
 [ "$DEVNUM" = "001" ] && exit 0
 
-NAME=`basename ${DEVPATH}`
+NAME=`basename ${DEVPATH} | tr . _`
 XS_KEY="qubes-usb-devices/$NAME"
 
 xenstore-rm "$XS_KEY"