diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile
index 020abfb25ef4..c4a300529cf2 100644
--- a/databases/rocksdb/Makefile
+++ b/databases/rocksdb/Makefile
@@ -1,79 +1,79 @@
 PORTNAME=	rocksdb
-PORTVERSION=	9.2.1
+PORTVERSION=	9.3.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Persistent key-value store for fast storage environments
 WWW=		https://rocksdb.org/ \
 		https://github.com/facebook/rocksdb
 
 LICENSE=	APACHE20 GPLv2
 LICENSE_COMB=	dual
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE.Apache
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 
 BROKEN_DragonFly=	does not build on DragonFly BSD using GCC with -Werror
 BROKEN_armv6=	does not build: db/c.cc:2281:44: implicit conversion loses integer precision: 'uint64_t' (aka 'unsigned long long') to 'size_t' (aka 'unsigned int')
 BROKEN_armv7=	does not build: /nxb-bin/usr/bin/ld: undefined reference to symbol `__gnu_Unwind_Find_exidx@@FBSD_1.4' (try adding -lc) #'`
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libgflags.so:devel/gflags \
 		libsnappy.so:archivers/snappy
 
 USES=		compiler:c++17-lang gmake localbase:ldflags perl5
 USE_PERL5=	build
 
 ALL_TARGET=	shared_lib static_lib all
 CFLAGS+=	-DOS_FREEBSD
 CONFIGURE_ARGS=	make_config.mk
 CONFIGURE_ENV=	PORTABLE=0 ROCKSDB_ROOT=${WRKSRC}
 CONFIGURE_SCRIPT=	build_tools/build_detect_platform
 HAS_CONFIGURE=	yes
 MAKE_ENV=	CXX=${CXX} INSTALL_PATH=${STAGEDIR}${PREFIX} USE_RTTI=1 V=1
 USE_CXXSTD=	c++17
 USE_LDCONFIG=	yes
 TEST_TARGET=	check
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} SHLIB_VER=${PORTVERSION:R}
 PORTDATA=	make_config.mk
 
 GH_ACCOUNT=	facebook
 USE_GITHUB=	yes
 
 CONFLICTS_INSTALL=	rocksdb-lite
 
 BENCHMARKS=	cache_bench db_bench memtablerep_bench persistent_cache_bench range_del_aggregator_bench table_reader_bench
 TOOLS=		blob_dump db_repl_stress db_sanity_test db_stress ldb rocksdb_dump rocksdb_undump sst_dump trace_analyzer write_stress
 
 OPTIONS_DEFINE=	DEBUG LZ4 ZSTD
 OPTIONS_DEFAULT=LZ4 ZSTD
 
 DEBUG_MAKE_ENV=		DEBUG_LEVEL=2
 DEBUG_MAKE_ENV_OFF=	DEBUG_LEVEL=0
 LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
 LZ4_MAKE_ENV_OFF=	ROCKSDB_DISABLE_LZ4=yes
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 ZSTD_MAKE_ENV_OFF=	ROCKSDB_DISABLE_ZSTD=yes
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 CXXFLAGS+=	-Wno-inconsistent-missing-override -Wno-unused-parameter -Wno-unused-variable -Wno-unused-private-field
 .endif
 
 post-patch:
 .if (${ARCH} == amd64 || ${ARCH} == i386) && !empty(CFLAGS:M-march=*)
 	@${REINPLACE_CMD} -e 's| -march=native| ${CFLAGS:M-march=*}|' ${WRKSRC}/build_tools/build_detect_platform
 .else
 	@${REINPLACE_CMD} -e 's| -march=native||' ${WRKSRC}/build_tools/build_detect_platform
 .endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/
 	cd ${WRKSRC}/ && ${INSTALL_PROGRAM} ${BENCHMARKS} ${TOOLS} ${STAGEDIR}${PREFIX}/bin/
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librocksdb.so
 	${INSTALL_LIB} ${WRKSRC}/librocksdb_test.so ${WRKSRC}/librocksdb_tools.so ${STAGEDIR}${PREFIX}/lib/
 	${INSTALL_DATA} ${WRKSRC}/make_config.mk ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.post.mk>
diff --git a/databases/rocksdb/distinfo b/databases/rocksdb/distinfo
index 3d2b30db3cfb..247c91aac6e9 100644
--- a/databases/rocksdb/distinfo
+++ b/databases/rocksdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1716892226
-SHA256 (facebook-rocksdb-v9.2.1_GH0.tar.gz) = bb20fd9a07624e0dc1849a8e65833e5421960184f9c469d508b58ed8f40a780f
-SIZE (facebook-rocksdb-v9.2.1_GH0.tar.gz) = 13491558
+TIMESTAMP = 1720022674
+SHA256 (facebook-rocksdb-v9.3.1_GH0.tar.gz) = e63f1be162998c0f49a538a7fe3fcac0e40cad77ee47d5592a65bca50f7c4620
+SIZE (facebook-rocksdb-v9.3.1_GH0.tar.gz) = 13512627
diff --git a/databases/rocksdb/files/patch-i386 b/databases/rocksdb/files/patch-i386
index 6a22158c1a84..e3c79f624b75 100644
--- a/databases/rocksdb/files/patch-i386
+++ b/databases/rocksdb/files/patch-i386
@@ -1,11 +1,13 @@
+https://github.com/facebook/rocksdb/commit/b03d4156609dd27f65ad199139eaae722c876b8c
+
 --- db_stress_tool/db_stress_common.cc.orig	2024-05-08 23:03:15 UTC
 +++ db_stress_tool/db_stress_common.cc
 @@ -200,7 +200,7 @@ void CompressedCacheSetCapacityThread(void* v) {
          // Lower by upto 50% of usable block cache capacity
          adjustment = (adjustment * thread->rand.Uniform(50)) / 100;
          block_cache->SetCapacity(capacity - adjustment);
 -        fprintf(stdout, "New cache capacity = %lu\n",
 +        fprintf(stdout, "New cache capacity = %zu\n",
                  block_cache->GetCapacity());
          db_stress_env->SleepForMicroseconds(10 * 1000 * 1000);
          block_cache->SetCapacity(capacity);