diff --git a/CHANGELOG.md b/CHANGELOG.md
index 502fdad..1340db5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+## [v0.8.4](https://github.com/shaarli/Shaarli/releases/tag/v0.8.4) - 2017-03-04
+### Security
+- Markdown plugin: escape HTML entities by default
+
+
 ## [v0.8.3](https://github.com/shaarli/Shaarli/releases/tag/v0.8.3) - 2017-01-20
 
 ### Fixed
diff --git a/index.php b/index.php
index 17fb4a2..b4ccd1b 100644
--- a/index.php
+++ b/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Shaarli v0.8.3 - Shaare your links...
+ * Shaarli v0.8.4 - Shaare your links...
  *
  * The personal, minimalist, super-fast, database free, bookmarking service.
  *
diff --git a/shaarli_version.php b/shaarli_version.php
index 3f79a4c..1c1c5d7 100644
--- a/shaarli_version.php
+++ b/shaarli_version.php
@@ -1 +1 @@
-<?php /* 0.8.3 */ ?>
+<?php /* 0.8.4 */ ?>