diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6849595..ccc3dc4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,26 @@
 
 ## v0.5.0 (WIP)
 
-  * [components] ErrorTag: Renamed prop `phx_trigger_action` to `trigger_action`
+  * Introduce new notation for template and slot nodes (`<#template>` and `<#slot>` respectively)
+  * Add `<:slotname>` shorthand for `<#template slot="slotname">`
+  * Introduce block expressions for surface templates (`{#if}..{/if}`, `{#for}...{/for}`, etc.)
+  * Introduce `{#if}` block expression with support for `{#elseif}` and `{#else}` sub blocks
+  * Introduce `{#unless}` block expression
+  * Introduce `{#for}` block expression with support for `{#else}` sub block
+  * Introduce `s-` prefix as an alternative to `:` for directives (i.e. `s-if` and `:if` are now equivalent)
+  * Introduce `values` directive for generating `phx-value-` attributes
+  * Added a convert task to aid migrating to the new syntax
+
+### Deprecations
+  * `<If>` was deprecated in favor of `{#if}...{/if}`
+  * `<template>` in favor of `<#template>`
+  * `<slot>` in favor of `<#slot>`
+
+### BREAKING CHANGES
+  * Replace interpolation delimiters `{{` and `}}` with `{` and `}`
+  * Remove support for interpolation inside `<style>...</style>` and `<script>...</script>` nodes
+  * Remove support for passing non-string attribute values as literals (i.e. `attr=true` or `attr=3`). Any non-string value should be passed as an expression (i.e. `selected={true}`)
+  * ErrorTag: Renamed prop `phx_trigger_action` to `trigger_action`
 
 ## v0.4.1 (2021-05-26)