diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..0c4d2c9b20b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG.asciidoc  merge=union
diff --git a/docs/CHANGELOG.asciidoc b/docs/CHANGELOG.asciidoc
new file mode 100644
index 00000000000..9c6e36a2e1d
--- /dev/null
+++ b/docs/CHANGELOG.asciidoc
@@ -0,0 +1,38 @@
+// Use these for links to issue and pulls. Note issues and pulls redirect one to
+// each other on Github, so don't worry too much on using the right prefix.
+// :issue: https://github.com/elastic/elasticsearch/issues/
+// :pull: https://github.com/elastic/elasticsearch/pull/
+
+= Elasticsearch Release Notes
+
+== Elasticsearch 7.0.0
+
+=== Breaking Changes
+
+=== Breaking Java Changes
+
+=== Deprecations
+
+=== New Features 
+
+=== Enhancements
+
+=== Bug Fixes
+
+=== Regressions
+
+=== Known Issues
+
+== Elasticsearch version 6.3.0
+
+=== New Features 
+
+=== Enhancements
+
+=== Bug Fixes
+
+=== Regressions
+
+=== Known Issues
+
+