diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2095cc6574..159a8911c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,29 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 This change log adheres to standards from [Keep a CHANGELOG](http://keepachangelog.com).
 
+## [7.12.4] - 2019-01-16
+
+### Fixed
+* [`no-unused-prop-types`][]: avoid a crash ([#2131][], @ljharb)
+* [`prop-types`][]: avoid further crashes from nonexistent nodes in unusedPropTypes ([#2127][], @ljharb)
+* [`prop-types`][]: Read name of callee object ([#2125][], @CrOrc)
+* [`prop-types`][]: Ignore reassignments when matching props declarations with components ([#2051][], [#1957][], @yannickcr)
+* [`prop-types`][], [`no-unused-prop-types`][], [`require-default-props`][]: Detect components with return statement in switch/case ([#2118][], @yannickcr)
+
+### Changed
+* [`prop-types`][], [`no-typos`][]: add passing test cases ([#2123][], [#2128][], [#2136][], [#2134][], @ljharb)
+
+[#2136]: https://github.com/yannickcr/eslint-plugin-react/issues/2136
+[#2134]: https://github.com/yannickcr/eslint-plugin-react/issues/2134
+[#2131]: https://github.com/yannickcr/eslint-plugin-react/issues/2131
+[#2128]: https://github.com/yannickcr/eslint-plugin-react/issues/2128
+[#2127]: https://github.com/yannickcr/eslint-plugin-react/issues/2127
+[#2125]: https://github.com/yannickcr/eslint-plugin-react/pull/2125
+[#2123]: https://github.com/yannickcr/eslint-plugin-react/issues/2123
+[#2118]: https://github.com/yannickcr/eslint-plugin-react/issues/2118
+[#2051]: https://github.com/yannickcr/eslint-plugin-react/issues/2051
+[#1957]: https://github.com/yannickcr/eslint-plugin-react/issues/1957
+
 ## [7.12.3] - 2019-01-04
 
 ### Fixed
diff --git a/package.json b/package.json
index ecba483ad5..adaa524fc9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react",
-  "version": "7.12.3",
+  "version": "7.12.4",
   "author": "Yannick Croissant <yannick.croissant+npm@gmail.com>",
   "description": "React specific linting rules for ESLint",
   "main": "index.js",