diff --git a/Makefile b/Makefile
index ae1b0570..cbe599ac 100644
--- a/Makefile
+++ b/Makefile
@@ -267,7 +267,7 @@ src-lib/libopenzwave/libopenzwave.cpp: openzwave/.lib/
 	${PYTHON_EXEC} setup-lib.py build --flavor=dev
 
 openzwave:
-	git clone -b hass git://github.com/home-assistant/open-zwave.git openzwave
+	git clone -b hass https://github.com/mpenick/open-zwave.git openzwave
 
 openzwave.gzip:
 	wget --no-check-certificate https://codeload.github.com/home-assistant/open-zwave/zip/hass
diff --git a/pyozw_setup.py b/pyozw_setup.py
index 7b653d8a..a35c3799 100644
--- a/pyozw_setup.py
+++ b/pyozw_setup.py
@@ -659,7 +659,7 @@ def install_minimal_dependencies(self):
         except Exception:
             log.warn("Can't get package list from pip.")
 
-    def get_openzwave(self, url='https://codeload.github.com/home-assistant/open-zwave/zip/hass'):
+    def get_openzwave(self, url='https://codeload.github.com/mpenick/open-zwave/zip/hass'):
         #Get openzwave
         """download an archive to a specific location"""
         dest,tail = os.path.split(self.openzwave)
@@ -736,7 +736,7 @@ def get_context(self):
         ctx = self.system_context(ctx, static=True)
         return ctx
 
-    def get_openzwave(self, url='https://codeload.github.com/home-assistant/open-zwave/zip/hass'):
+    def get_openzwave(self, url='https://codeload.github.com/mpenick/open-zwave/zip/hass'):
         return True
 
 class GitTemplate(Template):
@@ -752,7 +752,7 @@ def get_context(self):
         ctx = self.system_context(ctx, static=True)
         return ctx
 
-    def get_openzwave(self, url='https://codeload.github.com/home-assistant/open-zwave/zip/hass'):
+    def get_openzwave(self, url='https://codeload.github.com/mpenick/open-zwave/zip/hass'):
         return Template.get_openzwave(self, url)
 
     def clean_all(self):
@@ -808,12 +808,12 @@ class OzwdevTemplate(GitTemplate):
     def __init__(self, **args):
         Template.__init__(self, openzwave=os.path.join("openzwave-git", 'open-zwave-Dev'), **args)
 
-    def get_openzwave(self, url='https://codeload.github.com/home-assistant/open-zwave/zip/dev'):
+    def get_openzwave(self, url='https://codeload.github.com/mpenick/open-zwave/zip/dev'):
         return Template.get_openzwave(self, url)
 
 class OzwdevSharedTemplate(GitSharedTemplate):
 
-    def get_openzwave(self, url='https://codeload.github.com/home-assistant/open-zwave/zip/dev'):
+    def get_openzwave(self, url='https://codeload.github.com/mpenick/open-zwave/zip/dev'):
         return Template.get_openzwave(self, url)
 
 class EmbedTemplate(Template):
@@ -916,7 +916,7 @@ def build(self):
     def copy_openzwave_config(self):
         return sys.platform.startswith("win")
 
-    def get_openzwave(self, url='https://codeload.github.com/home-assistant/open-zwave/zip/hass'):
+    def get_openzwave(self, url='https://codeload.github.com/mpenick/open-zwave/zip/hass'):
         return True
 
 def parse_template(sysargv):