diff --git a/Doxygen b/Doxygen
index eb1caef4c..35b8ca1f7 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.19.3
+PROJECT_NUMBER         = 1.19.4
 
 # 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 1bc775987..7306691b1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 ESPHOME_PATH = ../esphome
-ESPHOME_REF = v1.19.3
+ESPHOME_REF = v1.19.4
 
 .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 74ac6bd38..d63a25a36 100644
--- a/_static/version
+++ b/_static/version
@@ -1 +1 @@
-1.19.3
\ No newline at end of file
+1.19.4
\ No newline at end of file
diff --git a/changelog/v1.19.0.rst b/changelog/v1.19.0.rst
index b209e64d9..a0e8a51c8 100644
--- a/changelog/v1.19.0.rst
+++ b/changelog/v1.19.0.rst
@@ -90,6 +90,16 @@ Release 1.19.3 - June 23
 
 - Bump esphome-dashboard to 20210622.0 :esphomepr:`1955` by :ghuser:`jesserockz`
 
+Release 1.19.4 - June 24
+------------------------
+
+- Rework climate traits :esphomepr:`1941` by :ghuser:`OttoWinter`
+- API raise minor version for climate changes :esphomepr:`1947` by :ghuser:`OttoWinter`
+- Disallow power_save_mode NONE if used together with BLE :esphomepr:`1950` by :ghuser:`OttoWinter`
+- Add climate preset NONE again :esphomepr:`1951` by :ghuser:`OttoWinter`
+- Compat argv parsing improvements :esphomepr:`1952` by :ghuser:`OttoWinter`
+- Bump dashboard to 20210623.0 :esphomepr:`1958` by :ghuser:`jesserockz`
+
 Full list of changes
 --------------------
 
diff --git a/conf.py b/conf.py
index adda93946..a9c3172bd 100644
--- a/conf.py
+++ b/conf.py
@@ -69,7 +69,7 @@ author = "Otto Winter"
 # The short X.Y version.
 version = "1.19"
 # The full version, including alpha/beta/rc tags.
-release = "1.19.3"
+release = "1.19.4"
 
 # 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 4a5c4678f..c90dee740 100644
--- a/guides/supporters.rst
+++ b/guides/supporters.rst
@@ -222,6 +222,7 @@ Contributors
 - `guptamp (@guptamp) <https://github.com/guptamp>`__
 - `Guyohms (@Guyohms) <https://github.com/Guyohms>`__
 - `h0-- (@h0--) <https://github.com/h0-->`__
+- `haade (@haade-administrator) <https://github.com/haade-administrator>`__
 - `Boris Hajduk (@hajdbo) <https://github.com/hajdbo>`__
 - `Gavin Mogan (@halkeye) <https://github.com/halkeye>`__
 - `Charles Thompson (@haryadoon) <https://github.com/haryadoon>`__
@@ -432,7 +433,6 @@ Contributors
 - `Peter Tatrai (@ptatrai) <https://github.com/ptatrai>`__
 - `Leandro Puerari (@puerari) <https://github.com/puerari>`__
 - `puuu (@puuu) <https://github.com/puuu>`__
-- `Karol Zlot (@qqgg231) <https://github.com/qqgg231>`__
 - `Tommy Jonsson (@quazzie) <https://github.com/quazzie>`__
 - `Quinn Hosler (@quinnhosler) <https://github.com/quinnhosler>`__
 - `r-jordan (@r-jordan) <https://github.com/r-jordan>`__
@@ -592,4 +592,4 @@ Contributors
 - `San (@zhujunsan) <https://github.com/zhujunsan>`__
 - `Christian Zufferey (@zuzu59) <https://github.com/zuzu59>`__
 
-*This page was last updated June 23, 2021.*
+*This page was last updated June 24, 2021.*