diff --git a/Doxygen b/Doxygen
index 3fad571e1..2bb1d5a72 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.12.0
+PROJECT_NUMBER         = 2021.12.1
 
 # 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 db1b4fe08..4c89b9916 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 ESPHOME_PATH = ../esphome
-ESPHOME_REF = 2021.12.0
+ESPHOME_REF = 2021.12.1
 
 .PHONY: html html-strict cleanhtml deploy help webserver Makefile netlify netlify-api api netlify-dependencies svg2png copy-svg2png minify
 
diff --git a/_static/version b/_static/version
index acbbb4230..22bd7d530 100644
--- a/_static/version
+++ b/_static/version
@@ -1 +1 @@
-2021.12.0
\ No newline at end of file
+2021.12.1
\ No newline at end of file
diff --git a/changelog/2021.12.0.rst b/changelog/2021.12.0.rst
index a4158b689..4c97de257 100644
--- a/changelog/2021.12.0.rst
+++ b/changelog/2021.12.0.rst
@@ -83,6 +83,11 @@ inversion of the direction. Instead, it seems that most if not all tuya covers h
 sets the direction on the secondary MCU. See the :doc:`documentation </components/cover/tuya>` for the new
 configuration options.
 
+Release 2021.12.1 - December 15
+-------------------------------
+
+- Set text sensor state property to filter output :esphomepr:`2893` by :ghuser:`oxan`
+- Allow button POST on press from web server :esphomepr:`2913` by :ghuser:`wilberforce`
 
 Full list of changes
 --------------------
diff --git a/conf.py b/conf.py
index e41b1b57e..cc60286f9 100644
--- a/conf.py
+++ b/conf.py
@@ -69,7 +69,7 @@ author = "Otto Winter"
 # The short X.Y version.
 version = "2021.12"
 # The full version, including alpha/beta/rc tags.
-release = "2021.12.0"
+release = "2021.12.1"
 
 # 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 360c5e91e..48ac102a5 100644
--- a/guides/supporters.rst
+++ b/guides/supporters.rst
@@ -331,6 +331,7 @@ Contributors
 - `James Callaghan (@jcallaghan) <https://github.com/jcallaghan>`__
 - `Josh Willox (@jcwillox) <https://github.com/jcwillox>`__
 - `Joshua Dadswell (@jdads1) <https://github.com/jdads1>`__
+- `jddonovan (@jddonovan) <https://github.com/jddonovan>`__
 - `jeff-h (@jeff-h) <https://github.com/jeff-h>`__
 - `Jeff Rescignano (@JeffResc) <https://github.com/JeffResc>`__
 - `Jej (@jej) <https://github.com/jej>`__
@@ -382,6 +383,7 @@ Contributors
 - `klenaers (@klenaers) <https://github.com/klenaers>`__
 - `Kevin Lewis (@kll) <https://github.com/kll>`__
 - `Koen Vervloesem (@koenvervloesem) <https://github.com/koenvervloesem>`__
+- `Petr Vraník (@konikvranik) <https://github.com/konikvranik>`__
 - `korellas (@korellas) <https://github.com/korellas>`__
 - `Kevin Pelzel (@kpelzel) <https://github.com/kpelzel>`__
 - `Karl Q. (@kquinsland) <https://github.com/kquinsland>`__
@@ -413,7 +415,6 @@ Contributors
 - `Barry Loong (@loongyh) <https://github.com/loongyh>`__
 - `Joakim Sørensen (@ludeeus) <https://github.com/ludeeus>`__
 - `Lukas Klass (@LukasK13) <https://github.com/LukasK13>`__
-- `lukaszrud (@lukaszrud) <https://github.com/lukaszrud>`__
 - `Lumpusz (@Lumpusz) <https://github.com/Lumpusz>`__
 - `Luke Fitzgerald (@lwfitzgerald) <https://github.com/lwfitzgerald>`__
 - `Lewis Juggins (@lwis) <https://github.com/lwis>`__
@@ -463,11 +464,8 @@ Contributors
 - `Michael Gorven (@mgorven) <https://github.com/mgorven>`__
 - `mhentschke (@mhentschke) <https://github.com/mhentschke>`__
 - `Michaël Arnauts (@michaelarnauts) <https://github.com/michaelarnauts>`__
-- `michaelmeller (@michaelmeller) <https://github.com/michaelmeller>`__
-- `micw (@micw) <https://github.com/micw>`__
 - `Pauline Middelink (@middelink) <https://github.com/middelink>`__
 - `Mikko Tervala (@MikkoTervala) <https://github.com/MikkoTervala>`__
-- `mikosoft83 (@mikosoft83) <https://github.com/mikosoft83>`__
 - `Minideezel (@minideezel) <https://github.com/minideezel>`__
 - `André Klitzing (@misery) <https://github.com/misery>`__
 - `Matthew Edwards (@mje-nz) <https://github.com/mje-nz>`__
@@ -489,6 +487,7 @@ Contributors
 - `Murilo (@murilobaliego) <https://github.com/murilobaliego>`__
 - `Michiel van Turnhout (@mvturnho) <https://github.com/mvturnho>`__
 - `Martin Weinelt (@mweinelt) <https://github.com/mweinelt>`__
+- `myhomeiot (@myhomeiot) <https://github.com/myhomeiot>`__
 - `Mynasru (@Mynasru) <https://github.com/Mynasru>`__
 - `Niels Ulrik Andersen (@myplacedk) <https://github.com/myplacedk>`__
 - `Kevin Uhlir (@n0bel) <https://github.com/n0bel>`__
@@ -538,6 +537,7 @@ Contributors
 - `Trammell Hudson (@osresearch) <https://github.com/osresearch>`__
 - `Otamay (@Otamay) <https://github.com/Otamay>`__
 - `Otto Winter (@OttoWinter) <https://github.com/OttoWinter>`__
+- `Ben Owen (@owenb321) <https://github.com/owenb321>`__
 - `Oxan van Leeuwen (@oxan) <https://github.com/oxan>`__
 - `Pack3tL0ss (@Pack3tL0ss) <https://github.com/Pack3tL0ss>`__
 - `Pablo Clemente Maseda (@paclema) <https://github.com/paclema>`__
@@ -663,6 +663,7 @@ Contributors
 - `Stijn Tintel (@stintel) <https://github.com/stintel>`__
 - `stubs12 (@stubs12) <https://github.com/stubs12>`__
 - `Jordan Vohwinkel (@sublime93) <https://github.com/sublime93>`__
+- `sveip (@sveip) <https://github.com/sveip>`__
 - `synco (@synco) <https://github.com/synco>`__
 - `Marcel Feix (@Syndlex) <https://github.com/Syndlex>`__
 - `Teemu Mikkonen (@T3m3z) <https://github.com/T3m3z>`__
@@ -704,6 +705,7 @@ Contributors
 - `tomlut (@tomlut) <https://github.com/tomlut>`__
 - `Tom Matheussen (@Tommatheussen) <https://github.com/Tommatheussen>`__
 - `Tom Price (@tomtom5152) <https://github.com/tomtom5152>`__
+- `tony (@tony-fav) <https://github.com/tony-fav>`__
 - `David Kiliani (@torfbolt) <https://github.com/torfbolt>`__
 - `Torwag (@torwag) <https://github.com/torwag>`__
 - `Felix Eckhofer (@tribut) <https://github.com/tribut>`__
@@ -760,4 +762,4 @@ Contributors
 - `ZTX18 (@ZTX18) <https://github.com/ZTX18>`__
 - `Christian Zufferey (@zuzu59) <https://github.com/zuzu59>`__
 
-*This page was last updated December 12, 2021.*
+*This page was last updated December 15, 2021.*