diff --git a/Doxygen b/Doxygen
index 33926b6ce..6a2a45631 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         = 2021.8.1
+PROJECT_NUMBER         = 2021.8.2
 
 # 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 3635f6b2b..f79a84e1c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 ESPHOME_PATH = ../esphome
-ESPHOME_REF = 2021.8.1
+ESPHOME_REF = 2021.8.2
 
 .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 3f8cfaf55..055002ff2 100644
--- a/_static/version
+++ b/_static/version
@@ -1 +1 @@
-2021.8.1
\ No newline at end of file
+2021.8.2
\ No newline at end of file
diff --git a/changelog/2021.8.0.rst b/changelog/2021.8.0.rst
index 441d9d780..5f5ca5294 100644
--- a/changelog/2021.8.0.rst
+++ b/changelog/2021.8.0.rst
@@ -109,6 +109,10 @@ Release 2021.8.1 - August 24
 - Fix template select lambda :esphomepr:`2198` by :ghuser:`ssieb`
 - Send Celsius temperature unit in MQTT discovery message :esphomepr:`1840` by :ghuser:`mtl010957`
 
+Release 2021.8.2 - August 25
+----------------------------
+
+- Revert "Light: include ON_OFF capability to BRIGHTNESS ColorMode" :esphomepr:`2202` by :ghuser:`jesserockz`
 
 Full list of changes
 --------------------
diff --git a/conf.py b/conf.py
index 36143327e..63968b346 100644
--- a/conf.py
+++ b/conf.py
@@ -69,7 +69,7 @@ author = "Otto Winter"
 # The short X.Y version.
 version = "2021.8"
 # The full version, including alpha/beta/rc tags.
-release = "2021.8.1"
+release = "2021.8.2"
 
 # 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 b8aa935e7..54aa783a0 100644
--- a/guides/supporters.rst
+++ b/guides/supporters.rst
@@ -557,6 +557,7 @@ Contributors
 - `Sascha (@Scarbous) <https://github.com/Scarbous>`__
 - `Nils Schulte (@Schnilz) <https://github.com/Schnilz>`__
 - `Ville Skyttä (@scop) <https://github.com/scop>`__
+- `Seganku (@seganku) <https://github.com/seganku>`__
 - `sekkr1 (@sekkr1) <https://github.com/sekkr1>`__
 - `SenexCrenshaw (@SenexCrenshaw) <https://github.com/SenexCrenshaw>`__
 - `Sergio (@sergio303) <https://github.com/sergio303>`__
@@ -578,6 +579,7 @@ Contributors
 - `Sourabh Jaiswal (@sourabhjaiswal) <https://github.com/sourabhjaiswal>`__
 - `Philip Allgaier (@spacegaier) <https://github.com/spacegaier>`__
 - `spattinson (@spattinson) <https://github.com/spattinson>`__
+- `Stephan Peijnik-Steinwender (@speijnik) <https://github.com/speijnik>`__
 - `spilin (@spilin) <https://github.com/spilin>`__
 - `square99 (@square99) <https://github.com/square99>`__
 - `Paul Krischer (@SqyD) <https://github.com/SqyD>`__
@@ -687,4 +689,4 @@ Contributors
 - `ZTX18 (@ZTX18) <https://github.com/ZTX18>`__
 - `Christian Zufferey (@zuzu59) <https://github.com/zuzu59>`__
 
-*This page was last updated August 24, 2021.*
+*This page was last updated August 25, 2021.*