diff --git a/Doxygen b/Doxygen
index 7818b2ce2..79ced0f06 100644
--- a/Doxygen
+++ b/Doxygen
@@ -38,7 +38,7 @@ PROJECT_NAME           = "ESPHome"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.13.5
+PROJECT_NUMBER         = 1.13.6
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/Makefile b/Makefile
index 0344776c0..f228305b1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 ESPHOME_PATH = ../esphome
-ESPHOME_REF = v1.13.5
+ESPHOME_REF = v1.13.6
 
 .PHONY: html html-strict cleanhtml deploy help webserver Makefile netlify netlify-api api netlify-dependencies svg2png copy-svg2png
 
diff --git a/_static/version b/_static/version
index d0e60d602..f31fa23a8 100644
--- a/_static/version
+++ b/_static/version
@@ -1 +1 @@
-1.13.5
\ No newline at end of file
+1.13.6
\ No newline at end of file
diff --git a/changelog/v1.13.0.rst b/changelog/v1.13.0.rst
index f9414b8e0..8d16c586b 100644
--- a/changelog/v1.13.0.rst
+++ b/changelog/v1.13.0.rst
@@ -190,6 +190,18 @@ Release 1.13.5 - June 8
 - esphome: Work around ESP32 BLE issue :esphomepr:`626`
 - esphome: Work around ESP32 core WiFi Bug :esphomepr:`627`
 
+Release 1.13.6 - June 14
+------------------------
+
+- docs: Lambas won't just work with the short name :docspr:`269` by :ghuser:`ryannazaretian`
+- esphome: Fix ESP32 RCSwitch Dump Stack Smash Protection :esphomepr:`636`
+- esphome: Fix russia timezone detection :esphomepr:`637`
+- esphome: Fix esp8266_restore_from_flash :esphomepr:`638`
+- esphome: Fix globals.set :esphomepr:`635`
+- esphome: Fix version.h file :esphomepr:`630`
+- esphome: Fix remote_receiver raw binary sensor :esphomepr:`639`
+- esphome: Re-add CustomMQTTDevice class :esphomepr:`640`
+
 All changes
 -----------
 
diff --git a/components/cover/template.rst b/components/cover/template.rst
index 339e84fee..dea4aafcb 100644
--- a/components/cover/template.rst
+++ b/components/cover/template.rst
@@ -101,7 +101,7 @@ Configuration options:
 .. note::
 
     This action can also be written in lambdas:
-L
+
     .. code-block:: cpp
 
         id(template_cov).position = COVER_OPEN;
diff --git a/conf.py b/conf.py
index dfd96f33d..9ded7d06d 100644
--- a/conf.py
+++ b/conf.py
@@ -72,7 +72,7 @@ author = 'Otto Winter'
 # The short X.Y version.
 version = '1.13'
 # The full version, including alpha/beta/rc tags.
-release = '1.13.5'
+release = '1.13.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/guides/supporters.rst b/guides/supporters.rst
index 3a38858e5..50a69c7a1 100644
--- a/guides/supporters.rst
+++ b/guides/supporters.rst
@@ -56,9 +56,11 @@ You guys are awesome!
 - Nick Rout
 - Paul Krischer
 - Paul Morley
+- Radu Tizu
 - Roman Priesol
 - Ryan
 - Ryan Bahm
+- Ryan Nazaretian
 - starwolf73
 - Wojciech Bederski
 - Zoltán Jáki
@@ -74,7 +76,7 @@ that have made it into the `ESPHome organization's <https://github.com/esphome>`
 Author & Main Developer
 ***********************
 
-- `Otto Winter (@OttoWinter) <https://github.com/OttoWinter>`__ - 1812 contributions
+- `Otto Winter (@OttoWinter) <https://github.com/OttoWinter>`__ - 1824 contributions
 
 Contributors
 ************
@@ -193,4 +195,4 @@ Contributors
 - `Vladimir Eremin (@yottatsa) <https://github.com/yottatsa>`__ - 1 contribution
 - `YuanL.Lee (@yuanl) <https://github.com/yuanl>`__ - 1 contribution
 
-*This page was last updated Tue Jun 11 18:24:06 2019 UTC.*
+*This page was last updated Sat Jun 15 16:55:22 2019 UTC.*