diff --git a/.gitmodules b/.gitmodules
index 5d994cf6ceb..ca0b1f024b8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,6 +22,3 @@
 [submodule "homeassistant/external/pymysensors"]
 	path = homeassistant/external/pymysensors
 	url = https://github.com/theolind/pymysensors
-[submodule "homeassistant/external/pyedimax"]
-	path = homeassistant/external/pyedimax
-	url = https://github.com/rkabadi/pyedimax
diff --git a/homeassistant/components/switch/edimax.py b/homeassistant/components/switch/edimax.py
index 426c016b59e..e988ffec0f0 100644
--- a/homeassistant/components/switch/edimax.py
+++ b/homeassistant/components/switch/edimax.py
@@ -15,12 +15,10 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
     """ Find and return Edimax Smart Plugs. """
     try:
         # pylint: disable=no-name-in-module, import-error
-        from homeassistant.external.pyedimax.smartplug import SmartPlug
+        from pyedimax.smartplug import SmartPlug
     except ImportError:
         logging.getLogger(__name__).exception((
-            "Failed to import pyedimax. "
-            "Did you maybe not run `git submodule init` "
-            "and `git submodule update`?"))
+            "Failed to import pyedimax. "))
 
         return
 
diff --git a/homeassistant/external/pyedimax b/homeassistant/external/pyedimax
deleted file mode 160000
index 674ada04c42..00000000000
--- a/homeassistant/external/pyedimax
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 674ada04c42da5c1103205293a078be73f661fd6
diff --git a/requirements.txt b/requirements.txt
index 83780721c2c..d77fe9b3b89 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -79,3 +79,6 @@ PyMata==2.07a
 
 # Mysensors serial gateway
 pyserial>=2.7
+
+# PyEdimax
+git+https://github.com/rkabadi/pyedimax.git
\ No newline at end of file