diff --git a/homeassistant/components/device_tracker/icloud.py b/homeassistant/components/device_tracker/icloud.py
index 2986bbec595..d196cc40107 100644
--- a/homeassistant/components/device_tracker/icloud.py
+++ b/homeassistant/components/device_tracker/icloud.py
@@ -16,9 +16,9 @@ https://home-assistant.io/components/device_tracker.icloud/
 """
 import logging
 
+import re
 from homeassistant.const import CONF_USERNAME, CONF_PASSWORD
 from homeassistant.helpers.event import track_utc_time_change
-import re
 
 SCAN_INTERVAL = 1800
 
@@ -49,7 +49,7 @@ def setup_scanner(hass, config, see):
                               verify=True)
     except PyiCloudFailedLoginException as error:
         _LOGGER.exception(
-            'Error logging into iCloud Service: {0}'.format(error)
+            'Error logging into iCloud Service: {}'.format(error)
         )
         return
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 2715ca3288d..2f5d27d0b7d 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -170,3 +170,6 @@ https://github.com/persandstrom/python-verisure/archive/9873c4527f01b1ba1f72ae60
 
 # homeassistant.components.zwave
 pydispatcher==2.0.5
+
+# homeassistant.sensor.icloud
+https://github.com/picklepete/pyicloud/archive/80f6cd6decc950514b8dc43b30c5bded81b34d5f.zip#pyicloud==0.8.0