diff --git a/HISTORY.md b/HISTORY.md
index dc8a44bbf..89ff62f5e 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,6 @@
 # Rocksdb Change Log
 
+## 3.12.0 (7/2/2015)
 ### New Features
 * Added experimental support for optimistic transactions.  See include/rocksdb/utilities/optimistic_transaction.h for more info.
 * Added a new way to report QPS from db_bench (check out --report_file and --report_interval_seconds)
diff --git a/include/rocksdb/version.h b/include/rocksdb/version.h
index 33e50c3fb..d25364947 100644
--- a/include/rocksdb/version.h
+++ b/include/rocksdb/version.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #define ROCKSDB_MAJOR 3
-#define ROCKSDB_MINOR 11
+#define ROCKSDB_MINOR 12
 #define ROCKSDB_PATCH 0
 
 // Do not use these. We made the mistake of declaring macros starting with