diff --git a/README.md b/README.md
index dc79b5358943c..0e6fdf7fcac5b 100644
--- a/README.md
+++ b/README.md
@@ -128,6 +128,7 @@
 - [Frequently Asked Questions (FAQ)](FAQ.md)
 - [TiDB Best Practices](https://pingcap.github.io/blog/2017/07/24/tidbbestpractice/)
 + [Releases](releases/rn.md)
+  - [2.0.4](releases/204.md)
   - [2.0.3](releases/203.md)
   - [2.0.2](releases/202.md)
   - [2.0.1](releases/201.md)
diff --git a/releases/204.md b/releases/204.md
new file mode 100644
index 0000000000000..6e6ce10b8d4f7
--- /dev/null
+++ b/releases/204.md
@@ -0,0 +1,41 @@
+---
+title: TiDB 2.0.4 Release Notes
+category: Releases
+---
+
+# TiDB 2.0.4 Release Notes
+
+On June 15, 2018, TiDB 2.0.4 is released. Compared with TiDB 2.0.3, this release has great improvement in system compatibility and stability.
+
+## TiDB
+
+- Support the `ALTER TABLE t DROP COLUMN a CASCADE` syntax
+- Support configuring the value of `tidb_snapshot` to TSO
+- Refine the display of statement types in monitoring items
+- Optimize the accuracy of query cost estimation
+- Configure the `backoff max delay` parameter of gRPC
+- Support configuring the memory threshold of a single statement in the configuration file
+- Refactor the error of Optimizer
+- Fix the side effects of the `Cast Decimal` data
+- Fix the wrong result issue of the `Merge Join` operator in specific scenarios
+- Fix the issue of converting the Null object to String
+- Fix the issue of casting the JSON type of data to the JSON type
+- Fix the issue that the result order is not consistent with MySQL in the condition of `Union` + `OrderBy`
+- Fix the compliance rules issue when the `Union` statement checks the `Limit/OrderBy` clause
+- Fix the compatibility issue of the `Union All` result
+- Fix a bug in predicate pushdown
+- Fix the compatibility issue of the `Union` statement with the `For Update` clause
+- Fix the issue that the `concat_ws` function mistakenly truncates the result
+
+## PD
+
+- Improve the behavior of the unset scheduling argument `max-pending-peer-count` by changing it to no limit for the maximum number of `PendingPeer`s
+
+## TiKV
+
+- Add the RocksDB `PerfContext` interface for debugging
+- Remove the `import-mode` parameter
+- Add the `region-properties` command for `tikv-ctl`
+- Fix the issue that `reverse-seek` is slow when many RocksDB tombstones exist
+- Fix the crash issue caused by `do_sub`
+- Make GC record the log when GC encounters many versions of data
diff --git a/releases/rn.md b/releases/rn.md
index c28992210f2fe..7f69d7cab9ebf 100644
--- a/releases/rn.md
+++ b/releases/rn.md
@@ -4,7 +4,8 @@ category: release
 ---
 
 # TiDB Release Notes
-
+  
+  - [2.0.4](204.md)
   - [2.0.3](203.md)
   - [2.0.2](202.md)
   - [2.0.1](201.md)