diff --git a/CHANGELOG b/CHANGELOG
index 2e91c72a25f..fd6ea54fbf1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,7 @@ v 7.11.0 (unreleased)
   - Improve UI for sidebar. Increase separation between navigation and content
   - Improve new project command options (Ben Bodenmiller)
   - Prevent sending empty messages to HipChat (Chulki Lee)
+  - Add footnotes support to Markdown (Guillaume Delbergue)
 
 v 7.10.0 (unreleased)
   - Ignore submodules that are defined in .gitmodules but are checked in as directories.
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index aff7011edd0..bc234500000 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -49,7 +49,8 @@ module GitlabMarkdownHelper
         strikethrough:       true,
         lax_spacing:         true,
         space_after_headers: true,
-        superscript:         true
+        superscript:         true,
+        footnotes:           true
       )
     end