diff --git a/homeassistant/components/zwave.py b/homeassistant/components/zwave.py
index 8e2861cbb21..b3c1dccbc25 100644
--- a/homeassistant/components/zwave.py
+++ b/homeassistant/components/zwave.py
@@ -63,7 +63,7 @@ def setup(hass, config):
     # pylint: disable=global-statement, import-error
     global NETWORK
 
-    from louie import connect
+    from pydispatch import dispatcher
     from openzwave.option import ZWaveOption
     from openzwave.network import ZWaveNetwork
 
@@ -89,7 +89,7 @@ def setup(hass, config):
                 pprint(_obj_to_dict(value))
             print("")
 
-        connect(log_all, weak=False)
+        dispatcher.connect(log_all, weak=False)
 
     def value_added(node, value):
         """ Called when a value is added to a node on the network. """
@@ -108,7 +108,7 @@ def setup(hass, config):
                     }
                 })
 
-    connect(
+    dispatcher.connect(
         value_added, ZWaveNetwork.SIGNAL_VALUE_ADDED, weak=False)
 
     def stop_zwave(event):
diff --git a/requirements.txt b/requirements.txt
index f4cd404beaf..0d727f10b85 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -30,5 +30,8 @@ pushbullet.py>=0.7.1
 # thermostat.nest
 python-nest>=2.1
 
+# z-wave
+pydispatcher>=2.0.5
+
 # pyyaml
 pyyaml
diff --git a/scripts/build_python_openzwave b/scripts/build_python_openzwave
index fc2b96608de..94517c88b8c 100755
--- a/scripts/build_python_openzwave
+++ b/scripts/build_python_openzwave
@@ -11,13 +11,6 @@ fi
 mkdir build
 cd build
 
-# We need to install louie here or else python-openzwave install
-# will download louie from PIP and that one is not compatible with Python 3
-git clone https://github.com/balloob/louie.git
-cd louie
-python3 setup.py install
-cd ..
-
 hg clone https://code.google.com/r/balloob-python-openzwave/
 cd balloob-python-openzwave
 ./update.sh