diff --git a/TOC.md b/TOC.md
index d138fd1420851..8db891ae3dc41 100644
--- a/TOC.md
+++ b/TOC.md
@@ -405,6 +405,7 @@
     - [3.1.0-beta.1](/releases/release-3.1.0-beta.1.md)
     - [3.1.0-beta](/releases/release-3.1.0-beta.md)
   + v3.0
+<<<<<<< HEAD
     - [3.0.16](/releases/release-3.0.16.md)
     - [3.0.15](/releases/release-3.0.15.md)
     - [3.0.14](/releases/release-3.0.14.md)
@@ -427,6 +428,31 @@
     - [3.0.0-rc.1](/releases/release-3.0.0-rc.1.md)
     - [3.0.0-beta.1](/releases/release-3.0.0-beta.1.md)
     - [3.0.0-beta](/releases/release-3.0-beta.md)
+=======
+    + [3.0.17](/releases/release-3.0.17.md)
+    + [3.0.16](/releases/release-3.0.16.md)
+    + [3.0.15](/releases/release-3.0.15.md)
+    + [3.0.14](/releases/release-3.0.14.md)
+    + [3.0.13](/releases/release-3.0.13.md)
+    + [3.0.12](/releases/release-3.0.12.md)
+    + [3.0.11](/releases/release-3.0.11.md)
+    + [3.0.10](/releases/release-3.0.10.md)
+    + [3.0.9](/releases/release-3.0.9.md)
+    + [3.0.8](/releases/release-3.0.8.md)
+    + [3.0.7](/releases/release-3.0.7.md)
+    + [3.0.6](/releases/release-3.0.6.md)
+    + [3.0.5](/releases/release-3.0.5.md)
+    + [3.0.4](/releases/release-3.0.4.md)
+    + [3.0.3](/releases/release-3.0.3.md)
+    + [3.0.2](/releases/release-3.0.2.md)
+    + [3.0.1](/releases/release-3.0.1.md)
+    + [3.0 GA](/releases/release-3.0-ga.md)
+    + [3.0.0-rc.3](/releases/release-3.0.0-rc.3.md)
+    + [3.0.0-rc.2](/releases/release-3.0.0-rc.2.md)
+    + [3.0.0-rc.1](/releases/release-3.0.0-rc.1.md)
+    + [3.0.0-beta.1](/releases/release-3.0.0-beta.1.md)
+    + [3.0.0-beta](/releases/release-3.0-beta.md)
+>>>>>>> 5c7b240... releases: update TiDB v3.0.17 release notes (#3465)
   + v2.1
     - [2.1.19](/releases/release-2.1.19.md)
     - [2.1.18](/releases/release-2.1.18.md)
diff --git a/releases/release-3.0.17.md b/releases/release-3.0.17.md
new file mode 100644
index 0000000000000..55f2fbd831c9a
--- /dev/null
+++ b/releases/release-3.0.17.md
@@ -0,0 +1,46 @@
+---
+title: TiDB 3.0.17 Release Notes
+---
+
+# TiDB 3.0.17 Release Notes
+
+Release date: Aug 3, 2020
+
+TiDB version: 3.0.17
+
+## Bug Fixes
+
++ TiDB
+
+    - Return the actual error message instead of an empty set when a query which contains `IndexHashJoin` or `IndexMergeJoin` encounters a panic [#18498](https://github.com/pingcap/tidb/pull/18498)
+    - Fix the unknown column error for SQL statements like `SELECT a FROM t HAVING t.a` [#18432](https://github.com/pingcap/tidb/pull/18432)
+    - Forbid adding a primary key for a table when the table has no primary key or when the table already has an integer primary key [#18342](https://github.com/pingcap/tidb/pull/18342)
+    - Return an empty set when executing `EXPLAIN FORMAT="dot" FOR CONNECTION` [#17157](https://github.com/pingcap/tidb/pull/17157)
+    - Fix `STR_TO_DATE`'s handling for format token '%r', '%h' [#18725](https://github.com/pingcap/tidb/pull/18725)
+
++ TiKV
+
+    - Fix a bug that might read stale data during region merging [#8111](https://github.com/tikv/tikv/pull/8111)
+    - Fix the issue of memory leak during the scheduling process [#8355](https://github.com/tikv/tikv/pull/8355)
+
++ TiDB Lightning
+
+    - Fix the issue that the `log-file` flag is ignored [#345](https://github.com/pingcap/tidb-lightning/pull/345)
+
+## Improvements
+
++ TiDB
+
+    - Ease the impact of statistics feedback on the cluster [#18770](https://github.com/pingcap/tidb/pull/18770)
+    - Limit batch split count for one request [#18694](https://github.com/pingcap/tidb/pull/18694)
+    - Accelerate `/tiflash/replica` HTTP API when there are many history DDL jobs in the TiDB cluster [#18386](https://github.com/pingcap/tidb/pull/18386)
+    - Improve row count estimation for index equal condition [#17609](https://github.com/pingcap/tidb/pull/17609)
+    - Speed up the execution of `kill tidb conn_id` [#18506](https://github.com/pingcap/tidb/pull/18506)
+
++ TiKV
+
+    - Add the `hibernate-timeout` configuration that delays region hibernation to improve rolling update performance [#8207](https://github.com/tikv/tikv/pull/8207)
+
++ TiDB Lightning
+
+    - `[black-white-list]` has been deprecated with a newer, easier-to-understand filter format [#332](https://github.com/pingcap/tidb-lightning/pull/332)
diff --git a/releases/release-notes.md b/releases/release-notes.md
index 51e4ebdcf66ea..9afce0854e190 100644
--- a/releases/release-notes.md
+++ b/releases/release-notes.md
@@ -17,6 +17,7 @@ aliases: ['/docs/v3.1/releases/release-notes/','/docs/v3.1/releases/rn/']
 
 ## 3.0
 
+- [3.0.17](/releases/release-3.0.17.md)
 - [3.0.16](/releases/release-3.0.16.md)
 - [3.0.15](/releases/release-3.0.15.md)
 - [3.0.14](/releases/release-3.0.14.md)