diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72725122b8f0c76e5b7e23b910bad11e2da85919..f9f38766392af0f5fce15498e38638a6b65a744b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,28 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 11.0.2 (2018-06-26)
+
+### Fixed (8 changes, 1 of them is from the community)
+
+- Serve favicon image always from the main GitLab domain to avoid issues with CORS. !19810 (Alexis Reigel)
+- Specify chart version when installing applications on Clusters. !20010
+- Fix invalid fuzzy translations being generated during installation. !20048
+- Fix incremental rollouts for Auto DevOps. !20061
+- Notify conflict for only open merge request. !20125
+- Only load Omniauth if enabled. !20132
+- Fix sorting by name on explore projects page. !20162
+- Fix alert button styling so that they don't show up white.
+
+### Performance (1 change)
+
+- Remove performance bottleneck preventing large wiki pages from displaying. !20174
+
+### Added (1 change)
+
+- Add support for verifying remote uploads, artifacts, and LFS objects in check rake tasks. !19501
+
+
 ## 11.0.1 (2018-06-21)
 
 ### Security (5 changes)
diff --git a/changelogs/unreleased/48126-fix-prometheus-installation.yml b/changelogs/unreleased/48126-fix-prometheus-installation.yml
deleted file mode 100644
index e6ab9c46fbf29ee58f4974f515b7e44c7b382231..0000000000000000000000000000000000000000
--- a/changelogs/unreleased/48126-fix-prometheus-installation.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Specify chart version when installing applications on Clusters
-merge_request: 20010
-author:
-type: fixed
diff --git a/changelogs/unreleased/48269-wiki-page-returns-error-code-502.yml b/changelogs/unreleased/48269-wiki-page-returns-error-code-502.yml
deleted file mode 100644
index d3830e5b8c60c9a73d3e30aefbfdabb0fc500ed1..0000000000000000000000000000000000000000
--- a/changelogs/unreleased/48269-wiki-page-returns-error-code-502.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove performance bottleneck preventing large wiki pages from displaying
-merge_request: 20174
-author:
-type: performance
diff --git a/changelogs/unreleased/48339-sorting-by-name-on-explore-projects-page-renders-a-500-error-when-logged-in.yml b/changelogs/unreleased/48339-sorting-by-name-on-explore-projects-page-renders-a-500-error-when-logged-in.yml
deleted file mode 100644
index 933d82b57c545631c709cb50fe5e48c408da87a8..0000000000000000000000000000000000000000
--- a/changelogs/unreleased/48339-sorting-by-name-on-explore-projects-page-renders-a-500-error-when-logged-in.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix sorting by name on explore projects page
-merge_request: 20162
-author:
-type: fixed
diff --git a/changelogs/unreleased/6591-dont-load-omniauth-if-not-enabled.yml b/changelogs/unreleased/6591-dont-load-omniauth-if-not-enabled.yml
deleted file mode 100644
index dd1c7e6955de0cd07576a94bbd4a1a50c2ff9623..0000000000000000000000000000000000000000
--- a/changelogs/unreleased/6591-dont-load-omniauth-if-not-enabled.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Only load Omniauth if enabled
-merge_request: 20132
-author:
-type: fixed
diff --git a/changelogs/unreleased/6598-notify-only-open-unmergeable-mr.yml b/changelogs/unreleased/6598-notify-only-open-unmergeable-mr.yml
deleted file mode 100644
index ae92c20fa1a0012857ebfe117fe7a86a5b0a1545..0000000000000000000000000000000000000000
--- a/changelogs/unreleased/6598-notify-only-open-unmergeable-mr.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Notify conflict for only open merge request
-merge_request: 20125
-author:
-type: fixed
diff --git a/changelogs/unreleased/bvl-dont-generate-mo.yml b/changelogs/unreleased/bvl-dont-generate-mo.yml
deleted file mode 100644
index 19b8e8738494f5b19ad64d3007bd0a6819f316a8..0000000000000000000000000000000000000000
--- a/changelogs/unreleased/bvl-dont-generate-mo.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix invalid fuzzy translations being generated during installation
-merge_request: 20048
-author:
-type: fixed
diff --git a/changelogs/unreleased/enforce-variable-value-to-be-a-string.yml b/changelogs/unreleased/enforce-variable-value-to-be-a-string.yml
deleted file mode 100644
index e2a932ee5bb44f6209249a5cda4c2a4ae1b81ab4..0000000000000000000000000000000000000000
--- a/changelogs/unreleased/enforce-variable-value-to-be-a-string.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix incremental rollouts for Auto DevOps
-merge_request: 20061
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-alert-btn.yml b/changelogs/unreleased/fix-alert-btn.yml
deleted file mode 100644
index d8bf561f05a5b1f311deae4e335bc39ce9ffb70e..0000000000000000000000000000000000000000
--- a/changelogs/unreleased/fix-alert-btn.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix alert button styling so that they don't show up white
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-favicon-cross-origin.yml b/changelogs/unreleased/fix-favicon-cross-origin.yml
deleted file mode 100644
index 3317781e222fc363bdaccfeac0ac6e8c9c91e1cc..0000000000000000000000000000000000000000
--- a/changelogs/unreleased/fix-favicon-cross-origin.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Serve favicon image always from the main GitLab domain to avoid issues with CORS
-merge_request: 19810
-author: Alexis Reigel
-type: fixed
diff --git a/changelogs/unreleased/mk-rake-task-verify-remote-files.yml b/changelogs/unreleased/mk-rake-task-verify-remote-files.yml
deleted file mode 100644
index 772aa11d89b61918851a9aed6af5ed6bee2b1e9e..0000000000000000000000000000000000000000
--- a/changelogs/unreleased/mk-rake-task-verify-remote-files.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add support for verifying remote uploads, artifacts, and LFS objects in check rake tasks
-merge_request: 19501
-author:
-type: added