diff --git a/.gitmodules b/.gitmodules
index 8ea8376a6a4e750e45177d0a12be20167bb556bb..12316f30e72c634f9c8c2f93ab140c8a95506b15 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "homeassistant/external/pywemo"]
 	path = homeassistant/external/pywemo
 	url = https://github.com/balloob/pywemo.git
+[submodule "homeassistant/external/phue"]
+	path = homeassistant/external/phue
+	url = https://github.com/studioimaginaire/phue.git
diff --git a/Dockerfile b/Dockerfile
index 7e37fc25f2b75de10c0b1cced7eae71db2525626..5c4cfc78704886dbecd373674a1322ce65319086 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,6 @@
 FROM python:3-onbuild
 MAINTAINER Paulus Schoutsen <Paulus@PaulusSchoutsen.nl>
 
-# Temporary fix while waiting for new version of phue to be released
-RUN curl https://raw.githubusercontent.com/studioimaginaire/phue/master/phue.py -o phue.py
-
 VOLUME /config
 
 EXPOSE 8123
diff --git a/homeassistant/components/light/__init__.py b/homeassistant/components/light/__init__.py
index a2595f51ae3c940c0ab06c85a61e0a97ac752ade..a59249ea2ef7caa573e7e85a07f6ed168c7e2fc4 100644
--- a/homeassistant/components/light/__init__.py
+++ b/homeassistant/components/light/__init__.py
@@ -362,7 +362,7 @@ class HueLightControl(object):
         host = config.get(ha.CONF_HOST, None)
 
         try:
-            import phue
+            import homeassistant.external.phue.phue as phue
         except ImportError:
             logger.exception(
                 "HueLightControl:Error while importing dependency phue.")
diff --git a/homeassistant/external/phue b/homeassistant/external/phue
new file mode 160000
index 0000000000000000000000000000000000000000..c96d8d5dbe08adfe3919734c1c8403cd7ec4873e
--- /dev/null
+++ b/homeassistant/external/phue
@@ -0,0 +1 @@
+Subproject commit c96d8d5dbe08adfe3919734c1c8403cd7ec4873e
diff --git a/requirements.txt b/requirements.txt
index 97bf954c46dc8da889744c3cdd38f4a965dc3842..48b5da9774e482cfc0d5c963f53aa0578e865c7c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,4 @@
 requests>=2.0
-phue>=0.7
 pychromecast>=0.5
 pyephem>=3.7
 pyuserinput>=0.1.9