diff --git a/Dockerfile b/Dockerfile
index 001c2cbcf87..6d34e1e4506 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,11 +12,10 @@ RUN apt-get update && \
     cd louie && \
     python setup.py install && \
     cd .. && \
-    hg clone https://code.google.com/p/python-openzwave/ && \
-    cd python-openzwave && \
+    hg clone https://code.google.com/r/balloob-python-openzwave/ && \
+    cd balloob-python-openzwave && \
     ./update.sh && \
     sed -i '253s/.*//' openzwave/cpp/src/value_classes/ValueID.h && \
-    2to3 --no-diffs -w -n api examples && \
     ./compile.sh && \
     ./install.sh
 
diff --git a/scripts/dev_docker b/scripts/dev_docker
index da13662d3b6..26cdc7beed9 100755
--- a/scripts/dev_docker
+++ b/scripts/dev_docker
@@ -14,8 +14,8 @@ if [ $# -gt 0 ]
 then
   docker run \
     --net=host \
+    --device=/dev/ttyUSB0:/zwaveusbstick:rwm \
     -e "TZ=$1" \
-    --device=/dev/bus/usb/002:/usbstick:rwm \
     -v `pwd`:/usr/src/app \
     -v `pwd`/config:/config \
     -t -i home-assistant-dev \