diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9dd28bbbc3..6ccad68ae5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,21 @@
 # Changelog for v3.x
 
-## v3.3.2-dev
+## v3.3.2 (2020-01-28)
 
 ### Enhancements
 
+  * [Ecto.Changeset] Only bump optimistic lock in case of success
+  * [Ecto.Query] Allow macros in Ecto window expressions
   * [Ecto.Schema] Support `:join_defaults` on `many_to_many` associations
+  * [Ecto.Schema] Allow MFargs to be given to association `:defaults`
+  * [Ecto.Type] Add `Ecto.Type.embedded_load` and `Ecto.Type.embedded_dump`
 
 ### Bug fixes
 
-  * [Ecto.Schema] Respect child schema prefix in `cast_assoc`
   * [Ecto.Repo] Ignore empty hostname when parsing database url (Elixir v1.10 support)
-  * [mix ecto.gen.repo] Use `config_path` when writing new config in ecto.gen.repo
+  * [Ecto.Repo] Rewrite combinations on Repo.exists? queries
+  * [Ecto.Schema] Respect child `@schema_prefix` in `cast_assoc`
+  * [mix ecto.gen.repo] Use `config_path` when writing new config in `mix ecto.gen.repo`
 
 ## v3.3.1 (2019-12-27)
 
diff --git a/mix.exs b/mix.exs
index 4fe611ef2f..c3f2811d05 100644
--- a/mix.exs
+++ b/mix.exs
@@ -1,7 +1,7 @@
 defmodule Ecto.MixProject do
   use Mix.Project
 
-  @version "3.3.1"
+  @version "3.3.2"
 
   def project do
     [
diff --git a/mix.lock b/mix.lock
index 9e2f27bad7..a7d9b33b1f 100644
--- a/mix.lock
+++ b/mix.lock
@@ -5,6 +5,6 @@
   "jason": {:hex, :jason, "1.0.0", "0f7cfa9bdb23fed721ec05419bcee2b2c21a77e926bce0deda029b5adc716fe2", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm"},
   "makeup": {:hex, :makeup, "1.0.0", "671df94cf5a594b739ce03b0d0316aa64312cee2574b6a44becb83cd90fb05dc", [:mix], [{:nimble_parsec, "~> 0.5.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.14.0", "cf8b7c66ad1cff4c14679698d532f0b5d45a3968ffbcbfd590339cb57742f1ae", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm"},
-  "nimble_parsec": {:hex, :nimble_parsec, "0.5.2", "1d71150d5293d703a9c38d4329da57d3935faed2031d64bc19e77b654ef2d177", [:mix], [], "hexpm"},
+  "nimble_parsec": {:hex, :nimble_parsec, "0.5.3", "def21c10a9ed70ce22754fdeea0810dafd53c2db3219a0cd54cf5526377af1c6", [:mix], [], "hexpm"},
   "poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], [], "hexpm"},
 }