diff --git a/.github/ISSUE_TEMPLATE/formatting.md b/.github/ISSUE_TEMPLATE/formatting.md
index 6164b0026..430607b40 100644
--- a/.github/ISSUE_TEMPLATE/formatting.md
+++ b/.github/ISSUE_TEMPLATE/formatting.md
@@ -26,7 +26,7 @@ Tip! Don't write this stuff manually.
 
 -->
 
-**Prettier 2.0.4**
+**Prettier 2.0.5**
 [Playground link](https://prettier.io/playground/#.....)
 
 ```sh
diff --git a/.github/ISSUE_TEMPLATE/integration.md b/.github/ISSUE_TEMPLATE/integration.md
index 509b61542..7ae45e2b2 100644
--- a/.github/ISSUE_TEMPLATE/integration.md
+++ b/.github/ISSUE_TEMPLATE/integration.md
@@ -20,7 +20,7 @@ BEFORE SUBMITTING AN ISSUE:
 
 **Environments:**
 
-- Prettier Version: 2.0.4
+- Prettier Version: 2.0.5
 - Running Prettier via: <!-- CLI, Node.js API, Browser API, etc. -->
 - Runtime: <!-- Node.js v6, Chrome v67, etc. -->
 - Operating System: <!-- Windows, Linux, macOS, etc. -->
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96e45e8c7..274795051 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,44 @@
+# 2.0.5
+
+[diff](https://github.com/prettier/prettier/compare/2.0.4...2.0.5)
+
+#### Less: Fix formatting of `:extend` ([#7984](https://github.com/prettier/prettier/pull/7984) by [@fisker](https://github.com/fisker))
+
+<!-- prettier-ignore -->
+```less
+// Input
+.class {
+  &:extend(.some-class .some-other-class .some-very-loooooooooooooong-class all);
+}
+
+// Prettier 2.0.4
+.class {
+  &:extend(
+    .some-class .some-other-class .some-very-loooooooooooooong-class all
+  );
+}
+
+// Prettier 2.0.4 (Second format)
+.class {
+  &: extend(
+    .some-class .some-other-class .some-very-loooooooooooooong-class all
+  );
+}
+
+// Prettier 2.0.5
+.class {
+  &:extend(
+    .some-class .some-other-class .some-very-loooooooooooooong-class all
+  );
+}
+```
+
+#### Editor integration: Use [`resolve`](https://www.npmjs.com/package/resolve) if builtin `require.resolve` is overridden ([#8072](https://github.com/prettier/prettier/pull/8072) by [@fisker](https://github.com/fisker))
+
+This fixes issues that the users of Atom and WebStorm faced with 2.0.4.
+
+Prettier now switches to using the `resolve` module for resolving configuration files and plugins if it detects that `require.resolve` isn't Node's builtin function (doesn't support the second argument), which happens in environments like editor extensions. To force the fallback, set the `PRETTIER_FALLBACK_RESOLVE` environment variable to `true`.
+
 # 2.0.4
 
 [diff](https://github.com/prettier/prettier/compare/2.0.3...2.0.4)
diff --git a/changelog_unreleased/less/pr-7984.md b/changelog_unreleased/less/pr-7984.md
deleted file mode 100644
index 5e3a864bc..000000000
--- a/changelog_unreleased/less/pr-7984.md
+++ /dev/null
@@ -1,30 +0,0 @@
-#### Fix `:extend` format ([#7984](https://github.com/prettier/prettier/pull/7984) by [@fisker](https://github.com/fisker))
-
-<!-- prettier-ignore -->
-```less
-// Input
-.class {
-  &:extend(.some-class .some-other-class .some-very-loooooooooooooong-class all);
-}
-
-// Prettier stable
-.class {
-  &:extend(
-    .some-class .some-other-class .some-very-loooooooooooooong-class all
-  );
-}
-
-// Prettier stable (Second format)
-.class {
-  &: extend(
-    .some-class .some-other-class .some-very-loooooooooooooong-class all
-  );
-}
-
-// Prettier master
-.class {
-  &:extend(
-    .some-class .some-other-class .some-very-loooooooooooooong-class all
-  );
-}
-```
diff --git a/docs/browser.md b/docs/browser.md
index e26f1dfec..e1d89e685 100644
--- a/docs/browser.md
+++ b/docs/browser.md
@@ -16,8 +16,8 @@ See [Usage](#usage) below for examples.
 ### Global
 
 ```html
-<script src="https://unpkg.com/prettier@2.0.4/standalone.js"></script>
-<script src="https://unpkg.com/prettier@2.0.4/parser-graphql.js"></script>
+<script src="https://unpkg.com/prettier@2.0.5/standalone.js"></script>
+<script src="https://unpkg.com/prettier@2.0.5/parser-graphql.js"></script>
 <script>
   prettier.format("query { }", {
     parser: "graphql",
@@ -42,8 +42,8 @@ prettier.format("query { }", {
 
 ```js
 define([
-  "https://unpkg.com/prettier@2.0.4/standalone.js",
-  "https://unpkg.com/prettier@2.0.4/parser-graphql.js",
+  "https://unpkg.com/prettier@2.0.5/standalone.js",
+  "https://unpkg.com/prettier@2.0.5/parser-graphql.js",
 ], (prettier, ...plugins) => {
   prettier.format("query { }", { parser: "graphql", plugins });
 });
@@ -62,7 +62,7 @@ This syntax doesn't necessarily work in the browser, but it can be used when bun
 ### Worker
 
 ```js
-importScripts("https://unpkg.com/prettier@2.0.4/standalone.js");
-importScripts("https://unpkg.com/prettier@2.0.4/parser-graphql.js");
+importScripts("https://unpkg.com/prettier@2.0.5/standalone.js");
+importScripts("https://unpkg.com/prettier@2.0.5/parser-graphql.js");
 prettier.format("query { }", { parser: "graphql", plugins: prettierPlugins });
 ```
diff --git a/docs/install.md b/docs/install.md
index aaf6d6642..c7a08347c 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -24,5 +24,5 @@ npm install --global prettier
 If you use `npx` to run Prettier, the version should be pinned like this:
 
 ```bash
-npx prettier@2.0.4 . --write
+npx prettier@2.0.5 . --write
 ```
diff --git a/package.json b/package.json
index f737971fa..bfe382bae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "2.1.0-dev",
+  "version": "2.0.5",
   "description": "Prettier is an opinionated code formatter",
   "bin": "./bin/prettier.js",
   "repository": "prettier/prettier",
diff --git a/website/versioned_docs/version-stable/browser.md b/website/versioned_docs/version-stable/browser.md
index 9f2b74886..e0619ef1c 100644
--- a/website/versioned_docs/version-stable/browser.md
+++ b/website/versioned_docs/version-stable/browser.md
@@ -17,8 +17,8 @@ See [Usage](#usage) below for examples.
 ### Global
 
 ```html
-<script src="https://unpkg.com/prettier@2.0.4/standalone.js"></script>
-<script src="https://unpkg.com/prettier@2.0.4/parser-graphql.js"></script>
+<script src="https://unpkg.com/prettier@2.0.5/standalone.js"></script>
+<script src="https://unpkg.com/prettier@2.0.5/parser-graphql.js"></script>
 <script>
   prettier.format("query { }", {
     parser: "graphql",
@@ -43,8 +43,8 @@ prettier.format("query { }", {
 
 ```js
 define([
-  "https://unpkg.com/prettier@2.0.4/standalone.js",
-  "https://unpkg.com/prettier@2.0.4/parser-graphql.js",
+  "https://unpkg.com/prettier@2.0.5/standalone.js",
+  "https://unpkg.com/prettier@2.0.5/parser-graphql.js",
 ], (prettier, ...plugins) => {
   prettier.format("query { }", { parser: "graphql", plugins });
 });
@@ -63,7 +63,7 @@ This syntax doesn't necessarily work in the browser, but it can be used when bun
 ### Worker
 
 ```js
-importScripts("https://unpkg.com/prettier@2.0.4/standalone.js");
-importScripts("https://unpkg.com/prettier@2.0.4/parser-graphql.js");
+importScripts("https://unpkg.com/prettier@2.0.5/standalone.js");
+importScripts("https://unpkg.com/prettier@2.0.5/parser-graphql.js");
 prettier.format("query { }", { parser: "graphql", plugins: prettierPlugins });
 ```
diff --git a/website/versioned_docs/version-stable/install.md b/website/versioned_docs/version-stable/install.md
index 292a85508..755c5b985 100644
--- a/website/versioned_docs/version-stable/install.md
+++ b/website/versioned_docs/version-stable/install.md
@@ -25,5 +25,5 @@ npm install --global prettier
 If you use `npx` to run Prettier, the version should be pinned like this:
 
 ```bash
-npx prettier@2.0.4 . --write
+npx prettier@2.0.5 . --write
 ```