diff --git a/HISTORY.md b/HISTORY.md
index 791dffc88..a4557c330 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,7 @@
 # Rocksdb Change Log
 ## Unreleased
+
+## 6.18.0 (02/19/2021)
 ### Behavior Changes
 * When retryable IO error occurs during compaction, it is mapped to soft error and set the BG error. However, auto resume is not called to clean the soft error since compaction will reschedule by itself. In this change, When retryable IO error occurs during compaction, BG error is not set. User will be informed the error via EventHelper.
 * Introduce a new trace file format for query tracing and replay and trace file version is bump up to 0.2. A payload map is added as the first portion of the payload. We will not have backward compatible issues when adding new entries to trace records. Added the iterator_upper_bound and iterator_lower_bound in Seek and SeekForPrev tracing function. Added them as the new payload member for iterator tracing.
diff --git a/include/rocksdb/version.h b/include/rocksdb/version.h
index 3cd4432d9..0283d1c42 100644
--- a/include/rocksdb/version.h
+++ b/include/rocksdb/version.h
@@ -10,7 +10,7 @@
 #include "rocksdb/rocksdb_namespace.h"
 
 #define ROCKSDB_MAJOR 6
-#define ROCKSDB_MINOR 17
+#define ROCKSDB_MINOR 18
 #define ROCKSDB_PATCH 0
 
 // Do not use these. We made the mistake of declaring macros starting with