diff --git a/databases/redis/Makefile b/databases/redis/Makefile
index dc1d150fa32a..07abbf78a3d5 100644
--- a/databases/redis/Makefile
+++ b/databases/redis/Makefile
@@ -1,84 +1,83 @@
 PORTNAME=	redis
-DISTVERSION=	8.2.3
+DISTVERSION=	8.4.0
 CATEGORIES=	databases
 MASTER_SITES=	https://download.redis.io/releases/
 
 MAINTAINER=	bofh@freebsd.org
 COMMENT=	Persistent key-value database with built-in net interface
 WWW=		https://redis.io/
 
 LICENSE=	AGPLv3 RSALv2 SSPLv1
 LICENSE_COMB=	dual
 LICENSE_NAME_RSALv2=	Redis Source Available License v2
 LICENSE_NAME_SSPLv1=	Server Side Public License v1
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS_RSALv2=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_SSPLv1=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		compiler:c11 cpe gmake tcl:test
 CPE_VENDOR=	redislabs
 USE_RC_SUBR=	redis sentinel
 
 MAKE_ENV=	OPTIMIZATION= \
 		V=yo
 
-LDFLAGS+=	-lpthread -lm -lexecinfo
 #PIE_UNSAFE=	ld: error: relocation R_X86_64_32 cannot be used against local \
 #		symbol; recompile with -fPIC
 
 CONFLICTS_INSTALL=	redis-devel redis[0-9]*
 
 PORTSCOUT=	limit:^[0-9\.]*$$
 SUB_FILES=	pkg-message
 SUB_LIST=	PORTNAME=${PORTNAME} \
 		REDIS_DBDIR=${REDIS_DBDIR} \
 		REDIS_LOGDIR=${REDIS_LOGDIR} \
 		REDIS_RUNDIR=${REDIS_RUNDIR} \
 		REDIS_USER=${USERS}
 
 USERS=		redis
 GROUPS=		redis
 
 PLIST_SUB=	REDIS_DBDIR=${REDIS_DBDIR} \
 		REDIS_GROUP=${GROUPS} \
 		REDIS_LOGDIR=${REDIS_LOGDIR} \
 		REDIS_RUNDIR=${REDIS_RUNDIR} \
 		REDIS_USER=${USERS}
 
 OPTIONS_DEFINE=		JEMALLOC TLS
 OPTIONS_DEFAULT=	TLS
 OPTIONS_SUB=		yes
 
 JEMALLOC_DESC=	Use jemalloc
 TLS_DESC=	Use TLS (openssl req.)
 
 JEMALLOC_MAKE_ENV=	USE_JEMALLOC=yes
 TLS_USES=		ssl
 TLS_MAKE_ENV=		BUILD_TLS=yes
 
 BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb redis-cli \
 		redis-sentinel redis-server
 
 REDIS_DBDIR?=	/var/db/redis
 REDIS_RUNDIR?=	/var/run/redis
 REDIS_LOGDIR?=	/var/log/redis
 
 post-patch-JEMALLOC-on:
 	@${REINPLACE_CMD} '78s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile
 
 post-build:
 	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${WRKSRC}/redis.conf > ${WRKDIR}/redis.conf
 
 do-install:
 	${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKDIR}/redis.conf ${STAGEDIR}${PREFIX}/etc/redis.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${STAGEDIR}${PREFIX}/etc/sentinel.conf.sample
 	${MKDIR} ${STAGEDIR}${REDIS_LOGDIR} \
 		${STAGEDIR}${REDIS_DBDIR} \
 		${STAGEDIR}${REDIS_RUNDIR}
 
 do-test:
 	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl
 
 .include <bsd.port.mk>
diff --git a/databases/redis/distinfo b/databases/redis/distinfo
index 75a166f43b08..b8d325bd63da 100644
--- a/databases/redis/distinfo
+++ b/databases/redis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1762155827
-SHA256 (redis-8.2.3.tar.gz) = d88f2361fdf3a3a8668fe5753e29915566109dca07b4cb036427ea6dc7783671
-SIZE (redis-8.2.3.tar.gz) = 3902358
+TIMESTAMP = 1764323267
+SHA256 (redis-8.4.0.tar.gz) = ca909aa15252f2ecb3a048cd086469827d636bf8334f50bb94d03fba4bfc56e8
+SIZE (redis-8.4.0.tar.gz) = 4109585
diff --git a/databases/redis/files/patch-deps_Makefile b/databases/redis/files/patch-deps_Makefile
index d0f405916a20..ff2007910cb6 100644
--- a/databases/redis/files/patch-deps_Makefile
+++ b/databases/redis/files/patch-deps_Makefile
@@ -1,21 +1,21 @@
---- deps/Makefile.orig	2025-08-04 11:05:03 UTC
+--- deps/Makefile.orig	2025-11-18 14:58:24 UTC
 +++ deps/Makefile
-@@ -110,7 +110,7 @@ else
+@@ -117,7 +117,7 @@ else
  ifeq ($(LUA_DEBUG),yes)
  	LUA_CFLAGS+= -O0 -g -DLUA_USE_APICHECK
  else
 -	LUA_CFLAGS+= -O2 
 +	LUA_CFLAGS+=
  endif
  ifeq ($(LUA_COVERAGE),yes)
  	LUA_CFLAGS += -fprofile-arcs -ftest-coverage
-@@ -138,7 +138,7 @@ jemalloc: .make-prerequisites
+@@ -145,7 +145,7 @@ jemalloc: .make-prerequisites
  
  jemalloc: .make-prerequisites
  	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
 -	cd jemalloc && ./configure --disable-cxx --with-version=5.3.0-0-g0 --with-lg-quantum=3 --disable-cache-oblivious --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
 -	cd jemalloc && $(MAKE) lib/libjemalloc.a
 +	cd jemalloc && ./configure --disable-cxx --with-version=5.3.0-0-g0 --with-lg-quantum=3 --disable-cache-oblivious --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
 +	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
  
  .PHONY: jemalloc
diff --git a/databases/redis/files/patch-src_Makefile b/databases/redis/files/patch-src_Makefile
index 40cff0e1b880..396ffc148099 100644
--- a/databases/redis/files/patch-src_Makefile
+++ b/databases/redis/files/patch-src_Makefile
@@ -1,39 +1,19 @@
---- src/Makefile.orig	2025-08-04 11:05:03 UTC
+--- src/Makefile.orig	2025-11-28 10:22:14 UTC
 +++ src/Makefile
 @@ -67,7 +67,7 @@ endif
  	STD+=-std=c99
  endif
  
 -PREFIX?=/usr/local
 +PREFIX:=$(PREFIX)
  INSTALL_BIN=$(PREFIX)/bin
  INSTALL=install
  PKG_CONFIG?=pkg-config
-@@ -143,7 +143,6 @@ FINAL_LIBS=-lm -lstdc++
+@@ -150,7 +150,6 @@ FINAL_LIBS=-lm -lstdc++
  FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
  FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(REDIS_LDFLAGS) $(DEBUG)
  FINAL_LIBS=-lm -lstdc++
 -DEBUG=-g -ggdb
  
  # Linux ARM32 needs -latomic at linking time
  ifneq (,$(findstring armv,$(uname_M)))
-@@ -182,6 +181,11 @@ else
- 	OPENSSL_PREFIX?=/usr/local/opt/openssl
- endif
- else
-+ifeq ($(uname_S),FreeBSD)
-+        # FreeBSD
-+        FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include
-+        FINAL_LDFLAGS= $(LDFLAGS) -pthread
-+else
- ifeq ($(uname_S),AIX)
-         # AIX
-         FINAL_LDFLAGS+= -Wl,-bexpall
-@@ -231,6 +235,7 @@ else
- 	# All the other OSes (notably Linux)
- 	FINAL_LDFLAGS+= -rdynamic
- 	FINAL_LIBS+=-ldl -pthread -lrt
-+endif
- endif
- endif
- endif