diff --git a/.gitmodules b/.gitmodules
index 42797ca5..74958279 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,8 +25,7 @@
 	url = https://github.com/google/flatbuffers.git
 [submodule "rocksdb"]
 	path = rocksdb
-	url = https://github.com/nanocurrency/rocksdb.git
-	branch = 6.13.3
+	url = https://github.com/facebook/rocksdb.git
 [submodule "diskhash"]
 	path = diskhash
 	url = https://github.com/nanocurrency/diskhash.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2f97220..b7ccda37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -431,6 +431,11 @@ else()
       ON
       CACHE BOOL "" FORCE)
 endif()
+set(FAIL_ON_WARNINGS
+    OFF
+    CACHE BOOL "") # Ignore unreachable code warning in merging_iterator.cc
+                   # RocksDB v7.8.3 on Windows
+                   # https://github.com/facebook/rocksdb/issues/11072
 add_subdirectory(rocksdb EXCLUDE_FROM_ALL)
 
 include_directories(cpptoml/include)
diff --git a/nano/node/rocksdb/rocksdb.cpp b/nano/node/rocksdb/rocksdb.cpp
index 82a3f920..13713a90 100644
--- a/nano/node/rocksdb/rocksdb.cpp
+++ b/nano/node/rocksdb/rocksdb.cpp
@@ -12,7 +12,7 @@
 #include <rocksdb/merge_operator.h>
 #include <rocksdb/slice.h>
 #include <rocksdb/slice_transform.h>
-#include <rocksdb/utilities/backupable_db.h>
+#include <rocksdb/utilities/backup_engine.h>
 #include <rocksdb/utilities/transaction.h>
 #include <rocksdb/utilities/transaction_db.h>
 
@@ -739,7 +739,7 @@ bool nano::rocksdb::store::copy_db (boost::filesystem::path const & destination_
 	std::unique_ptr<::rocksdb::BackupEngine> backup_engine;
 	{
 		::rocksdb::BackupEngine * backup_engine_raw;
-		::rocksdb::BackupableDBOptions backup_options (destination_path.string ());
+		::rocksdb::BackupEngineOptions backup_options (destination_path.string ());
 		// Use incremental backups (default)
 		backup_options.share_table_files = true;
 
@@ -775,7 +775,7 @@ bool nano::rocksdb::store::copy_db (boost::filesystem::path const & destination_
 		std::unique_ptr<::rocksdb::BackupEngineReadOnly> backup_engine_read;
 		{
 			::rocksdb::BackupEngineReadOnly * backup_engine_read_raw;
-			status = ::rocksdb::BackupEngineReadOnly::Open (::rocksdb::Env::Default (), ::rocksdb::BackupableDBOptions (destination_path.string ()), &backup_engine_read_raw);
+			status = ::rocksdb::BackupEngineReadOnly::Open (::rocksdb::Env::Default (), ::rocksdb::BackupEngineOptions (destination_path.string ()), &backup_engine_read_raw);
 		}
 		if (!status.ok ())
 		{
diff --git a/rocksdb b/rocksdb
index 79f08d7f..bf2c3351 160000
--- a/rocksdb
+++ b/rocksdb
@@ -1 +1 @@
-Subproject commit 79f08d7ffa6d34d9ca3357777bcb335884a56cfb
+Subproject commit bf2c335184de16a3cc1787fa97ef9f22f7114238