diff --git a/homeassistant/const.py b/homeassistant/const.py
index 30b81385877..95a3c63bb8f 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -2,7 +2,7 @@
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
 MINOR_VERSION = 55
-PATCH_VERSION = '1'
+PATCH_VERSION = '2'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 4, 2)
diff --git a/homeassistant/scripts/credstash.py b/homeassistant/scripts/credstash.py
index f17105d83de..4c9273b8299 100644
--- a/homeassistant/scripts/credstash.py
+++ b/homeassistant/scripts/credstash.py
@@ -24,6 +24,7 @@ def run(args):
         'value', help="The value to save when putting a secret",
         nargs='?', default=None)
 
+    # pylint: disable=import-error
     import credstash
     import botocore
 
diff --git a/homeassistant/util/yaml.py b/homeassistant/util/yaml.py
index c484fe3372a..da97ed5662e 100644
--- a/homeassistant/util/yaml.py
+++ b/homeassistant/util/yaml.py
@@ -13,7 +13,7 @@ except ImportError:
     keyring = None
 
 try:
-    import credstash
+    import credstash  # pylint: disable=import-error
 except ImportError:
     credstash = None
 
diff --git a/requirements_all.txt b/requirements_all.txt
index 6bbc87aed06..d7f53c75dc1 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -156,7 +156,7 @@ colorlog==3.0.1
 concord232==0.14
 
 # homeassistant.scripts.credstash
-credstash==1.13.3
+# credstash==1.13.3
 
 # homeassistant.components.sensor.crimereports
 crimereports==1.0.0
diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py
index dd1602fba6f..ba9cecb6684 100755
--- a/script/gen_requirements_all.py
+++ b/script/gen_requirements_all.py
@@ -29,7 +29,8 @@ COMMENT_REQUIREMENTS = (
     'blinkt',
     'smbus-cffi',
     'envirophat',
-    'i2csense'
+    'i2csense',
+    'credstash'
 )
 
 TEST_REQUIREMENTS = (