diff --git a/.github/ISSUE_TEMPLATE/formatting.md b/.github/ISSUE_TEMPLATE/formatting.md
index d380ccdfa..c5698f027 100644
--- a/.github/ISSUE_TEMPLATE/formatting.md
+++ b/.github/ISSUE_TEMPLATE/formatting.md
@@ -26,7 +26,7 @@ Don't fill the form below manually! Let a program create a report for you:
 
 -->
 
-**Prettier 2.5.0**
+**Prettier 2.5.1**
 [Playground link](https://prettier.io/playground/#.....)
 
 ```sh
diff --git a/.github/ISSUE_TEMPLATE/integration.md b/.github/ISSUE_TEMPLATE/integration.md
index 19c6fb6fd..5475c704a 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.5.0
+- Prettier Version: 2.5.1
 - Running Prettier via: <!-- CLI, Node.js API, Browser API, etc. -->
 - Runtime: <!-- Node.js v14, Chrome v83, etc. -->
 - Operating System: <!-- Windows, Linux, macOS, etc. -->
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 529ed086f..bfa58ad02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,68 @@
+# 2.5.1
+
+[diff](https://github.com/prettier/prettier/compare/2.5.0...2.5.1)
+
+#### Improve formatting for empty tuple types ([#11884](https://github.com/prettier/prettier/pull/11884) by [@sosukesuzuki](https://github.com/sosukesuzuki))
+
+<!-- prettier-ignore -->
+```tsx
+// Input
+type Foo =
+  Foooooooooooooooooooooooooooooooooooooooooooooooooooooooooo extends []
+    ? Foo3
+    : Foo4;
+
+// Prettier 2.5.0
+type Foo = Foooooooooooooooooooooooooooooooooooooooooooooooooooooooooo extends [
+
+]
+  ? Foo3
+  : Foo4;
+
+// Prettier 2.5.0 (tailingCommma = all)
+// Invalid TypeScript code
+type Foo = Foooooooooooooooooooooooooooooooooooooooooooooooooooooooooo extends [
+  ,
+]
+  ? Foo3
+  : Foo4;
+
+// Prettier 2.5.1
+type Foo =
+  Foooooooooooooooooooooooooooooooooooooooooooooooooooooooooo extends []
+    ? Foo3
+    : Foo4;
+
+```
+
+#### Fix compatibility with Jest inline snapshot test ([#11892](https://github.com/prettier/prettier/pull/11892) by [@fisker](https://github.com/fisker))
+
+A internal change in Prettier@v2.5.0 accidentally breaks the Jest inline snapshot test.
+
+#### Support Glimmer's named blocks ([#11899](https://github.com/prettier/prettier/pull/11899) by [@duailibe](https://github.com/duailibe))
+
+Prettier already supported this feature, but it converted empty named blocks to self-closing, which is not supported by the Glimmer compiler.
+
+See: [Glimmer's named blocks](https://emberjs.github.io/rfcs/0460-yieldable-named-blocks.html).
+
+<!-- prettier-ignore -->
+```hbs
+// Input
+<Component>
+  <:named></:named>
+</Component>
+
+// Prettier 2.5.0
+<Component>
+  <:named />
+</Component>
+
+// Prettier 2.5.1
+<Component>
+  <:named></:named>
+</Component>
+```
+
 # 2.5.0
 
 [diff](https://github.com/prettier/prettier/compare/2.4.1...2.5.0)
diff --git a/docs/browser.md b/docs/browser.md
index bb0117920..38c132e6c 100644
--- a/docs/browser.md
+++ b/docs/browser.md
@@ -32,8 +32,8 @@ See below for examples.
 ### Global
 
 ```html
-<script src="https://unpkg.com/prettier@2.5.0/standalone.js"></script>
-<script src="https://unpkg.com/prettier@2.5.0/parser-graphql.js"></script>
+<script src="https://unpkg.com/prettier@2.5.1/standalone.js"></script>
+<script src="https://unpkg.com/prettier@2.5.1/parser-graphql.js"></script>
 <script>
   prettier.format("type Query { hello: String }", {
     parser: "graphql",
@@ -48,8 +48,8 @@ Note that the [`unpkg` field](https://unpkg.com/#examples) in Prettier’s `pack
 
 ```html
 <script type="module">
-  import prettier from "https://unpkg.com/prettier@2.5.0/esm/standalone.mjs";
-  import parserGraphql from "https://unpkg.com/prettier@2.5.0/esm/parser-graphql.mjs";
+  import prettier from "https://unpkg.com/prettier@2.5.1/esm/standalone.mjs";
+  import parserGraphql from "https://unpkg.com/prettier@2.5.1/esm/parser-graphql.mjs";
 
   prettier.format("type Query { hello: String }", {
     parser: "graphql",
@@ -62,8 +62,8 @@ Note that the [`unpkg` field](https://unpkg.com/#examples) in Prettier’s `pack
 
 ```js
 define([
-  "https://unpkg.com/prettier@2.5.0/standalone.js",
-  "https://unpkg.com/prettier@2.5.0/parser-graphql.js",
+  "https://unpkg.com/prettier@2.5.1/standalone.js",
+  "https://unpkg.com/prettier@2.5.1/parser-graphql.js",
 ], (prettier, ...plugins) => {
   prettier.format("type Query { hello: String }", {
     parser: "graphql",
@@ -88,8 +88,8 @@ This syntax doesn’t necessarily work in the browser, but it can be used when b
 ### Worker
 
 ```js
-importScripts("https://unpkg.com/prettier@2.5.0/standalone.js");
-importScripts("https://unpkg.com/prettier@2.5.0/parser-graphql.js");
+importScripts("https://unpkg.com/prettier@2.5.1/standalone.js");
+importScripts("https://unpkg.com/prettier@2.5.1/parser-graphql.js");
 prettier.format("type Query { hello: String }", {
   parser: "graphql",
   plugins: prettierPlugins,
@@ -102,8 +102,8 @@ If you want to format [embedded code](options.md#embedded-language-formatting),
 
 ```html
 <script type="module">
-  import prettier from "https://unpkg.com/prettier@2.5.0/esm/standalone.mjs";
-  import parserBabel from "https://unpkg.com/prettier@2.5.0/esm/parser-babel.mjs";
+  import prettier from "https://unpkg.com/prettier@2.5.1/esm/standalone.mjs";
+  import parserBabel from "https://unpkg.com/prettier@2.5.1/esm/parser-babel.mjs";
 
   console.log(
     prettier.format("const html=/* HTML */ `<DIV> </DIV>`", {
@@ -119,9 +119,9 @@ The HTML code embedded in JavaScript stays unformatted because the `html` parser
 
 ```html
 <script type="module">
-  import prettier from "https://unpkg.com/prettier@2.5.0/esm/standalone.mjs";
-  import parserBabel from "https://unpkg.com/prettier@2.5.0/esm/parser-babel.mjs";
-  import parserHtml from "https://unpkg.com/prettier@2.5.0/esm/parser-html.mjs";
+  import prettier from "https://unpkg.com/prettier@2.5.1/esm/standalone.mjs";
+  import parserBabel from "https://unpkg.com/prettier@2.5.1/esm/parser-babel.mjs";
+  import parserHtml from "https://unpkg.com/prettier@2.5.1/esm/parser-html.mjs";
 
   console.log(
     prettier.format("const html=/* HTML */ `<DIV> </DIV>`", {
diff --git a/package.json b/package.json
index fa6497d5f..dc8966db3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "2.6.0-dev",
+  "version": "2.5.1",
   "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 810c5d6e1..2790d0951 100644
--- a/website/versioned_docs/version-stable/browser.md
+++ b/website/versioned_docs/version-stable/browser.md
@@ -33,8 +33,8 @@ See below for examples.
 ### Global
 
 ```html
-<script src="https://unpkg.com/prettier@2.5.0/standalone.js"></script>
-<script src="https://unpkg.com/prettier@2.5.0/parser-graphql.js"></script>
+<script src="https://unpkg.com/prettier@2.5.1/standalone.js"></script>
+<script src="https://unpkg.com/prettier@2.5.1/parser-graphql.js"></script>
 <script>
   prettier.format("type Query { hello: String }", {
     parser: "graphql",
@@ -49,8 +49,8 @@ Note that the [`unpkg` field](https://unpkg.com/#examples) in Prettier’s `pack
 
 ```html
 <script type="module">
-  import prettier from "https://unpkg.com/prettier@2.5.0/esm/standalone.mjs";
-  import parserGraphql from "https://unpkg.com/prettier@2.5.0/esm/parser-graphql.mjs";
+  import prettier from "https://unpkg.com/prettier@2.5.1/esm/standalone.mjs";
+  import parserGraphql from "https://unpkg.com/prettier@2.5.1/esm/parser-graphql.mjs";
 
   prettier.format("type Query { hello: String }", {
     parser: "graphql",
@@ -63,8 +63,8 @@ Note that the [`unpkg` field](https://unpkg.com/#examples) in Prettier’s `pack
 
 ```js
 define([
-  "https://unpkg.com/prettier@2.5.0/standalone.js",
-  "https://unpkg.com/prettier@2.5.0/parser-graphql.js",
+  "https://unpkg.com/prettier@2.5.1/standalone.js",
+  "https://unpkg.com/prettier@2.5.1/parser-graphql.js",
 ], (prettier, ...plugins) => {
   prettier.format("type Query { hello: String }", {
     parser: "graphql",
@@ -89,8 +89,8 @@ This syntax doesn’t necessarily work in the browser, but it can be used when b
 ### Worker
 
 ```js
-importScripts("https://unpkg.com/prettier@2.5.0/standalone.js");
-importScripts("https://unpkg.com/prettier@2.5.0/parser-graphql.js");
+importScripts("https://unpkg.com/prettier@2.5.1/standalone.js");
+importScripts("https://unpkg.com/prettier@2.5.1/parser-graphql.js");
 prettier.format("type Query { hello: String }", {
   parser: "graphql",
   plugins: prettierPlugins,
@@ -103,8 +103,8 @@ If you want to format [embedded code](options.md#embedded-language-formatting),
 
 ```html
 <script type="module">
-  import prettier from "https://unpkg.com/prettier@2.5.0/esm/standalone.mjs";
-  import parserBabel from "https://unpkg.com/prettier@2.5.0/esm/parser-babel.mjs";
+  import prettier from "https://unpkg.com/prettier@2.5.1/esm/standalone.mjs";
+  import parserBabel from "https://unpkg.com/prettier@2.5.1/esm/parser-babel.mjs";
 
   console.log(
     prettier.format("const html=/* HTML */ `<DIV> </DIV>`", {
@@ -120,9 +120,9 @@ The HTML code embedded in JavaScript stays unformatted because the `html` parser
 
 ```html
 <script type="module">
-  import prettier from "https://unpkg.com/prettier@2.5.0/esm/standalone.mjs";
-  import parserBabel from "https://unpkg.com/prettier@2.5.0/esm/parser-babel.mjs";
-  import parserHtml from "https://unpkg.com/prettier@2.5.0/esm/parser-html.mjs";
+  import prettier from "https://unpkg.com/prettier@2.5.1/esm/standalone.mjs";
+  import parserBabel from "https://unpkg.com/prettier@2.5.1/esm/parser-babel.mjs";
+  import parserHtml from "https://unpkg.com/prettier@2.5.1/esm/parser-html.mjs";
 
   console.log(
     prettier.format("const html=/* HTML */ `<DIV> </DIV>`", {