diff --git a/databases/valkey/Makefile b/databases/valkey/Makefile
index 256d707145cb..57bed717ffff 100644
--- a/databases/valkey/Makefile
+++ b/databases/valkey/Makefile
@@ -1,72 +1,72 @@
 PORTNAME=	valkey
-DISTVERSION=	9.0.4
+DISTVERSION=	9.1.0
 CATEGORIES=	databases
 
 MAINTAINER=	bofh@freebsd.org
 COMMENT=	High-performance data structure server that primarily serves key/value workloads
 WWW=		https://valkey.io/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake pkgconfig tcl:test
 USE_GITHUB=	yes
 GH_ACCOUNT=	valkey-io
 USE_RC_SUBR=	valkey valkeysentinel
 
 MAKE_ENV=	OPTIMIZATION= \
 		V=1
 
 LDFLAGS+=	-lpthread -lm -lexecinfo
 
 SUB_FILES=	pkg-message
 SUB_LIST+=	PORTNAME=${PORTNAME} \
 		VALKEY_DBDIR=${VALKEY_DBDIR} \
 		VALKEY_LOGDIR=${VALKEY_LOGDIR} \
 		VALKEY_RUNDIR=${VALKEY_RUNDIR} \
 		VALKEY_USER=${USERS}
 
 USERS=		valkey
 GROUPS=		valkey
 
 PLIST_SUB+=	VALKEY_DBDIR=${VALKEY_DBDIR} \
 		VALKEY_GROUP=${GROUPS} \
 		VALKEY_LOGDIR=${VALKEY_LOGDIR} \
 		VALKEY_RUNDIR=${VALKEY_RUNDIR} \
 		VALKEY_USER=${USERS}
 
 OPTIONS_DEFINE=		JEMALLOC TLS
 OPTIONS_DEFAULT=	TLS
 OPTIONS_SUB=		yes
 
 JEMALLOC_DESC=	Use jemalloc
 TLS_DESC=	Use TLS
 
 JEMALLOC_MAKE_ENV=	MALLOC=jemalloc
 TLS_USES=		ssl
 TLS_MAKE_ENV=		BUILD_TLS=yes
 
 VALKEY_DBDIR?=	/var/db/valkey
 VALKEY_RUNDIR?=	/var/run/valkey
 VALKEY_LOGDIR?=	/var/log/valkey
 
 post-build:
 	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${WRKSRC}/valkey.conf > ${WRKDIR}/valkey.conf
 	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${WRKSRC}/sentinel.conf > ${WRKDIR}/valkey-sentinel.conf
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/valkey.conf ${STAGEDIR}${PREFIX}/etc/valkey.conf.sample
 	${INSTALL_DATA} ${WRKDIR}/valkey-sentinel.conf ${STAGEDIR}${PREFIX}/etc/valkey-sentinel.conf.sample
 	${MKDIR} ${STAGEDIR}${VALKEY_LOGDIR} \
 		${STAGEDIR}${VALKEY_DBDIR} \
 		${STAGEDIR}${VALKEY_RUNDIR}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/valkey-benchmark
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/valkey-cli
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/valkey-server
 
 do-test:
 	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl
 
 .include <bsd.port.mk>
diff --git a/databases/valkey/distinfo b/databases/valkey/distinfo
index efc461b38d54..f9b9596edafe 100644
--- a/databases/valkey/distinfo
+++ b/databases/valkey/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1778691525
-SHA256 (valkey-io-valkey-9.0.4_GH0.tar.gz) = 8d65e12cc9edb14d117b56fd33300e7b8cde2c087356de3f055d44689667670b
-SIZE (valkey-io-valkey-9.0.4_GH0.tar.gz) = 4127664
+TIMESTAMP = 1779640185
+SHA256 (valkey-io-valkey-9.1.0_GH0.tar.gz) = 7789fe1df257774457bafb4c1d56c9f7020c3879a7f5b4234af9030b2bd82dfd
+SIZE (valkey-io-valkey-9.1.0_GH0.tar.gz) = 4375381
diff --git a/databases/valkey/files/patch-deps-linenoise-Makefile b/databases/valkey/files/patch-deps-linenoise-Makefile
index aef0f10966af..e09a048a61e6 100644
--- a/databases/valkey/files/patch-deps-linenoise-Makefile
+++ b/databases/valkey/files/patch-deps-linenoise-Makefile
@@ -1,15 +1,15 @@
---- deps/linenoise/Makefile.orig	2019-09-25 10:40:18 UTC
+--- deps/linenoise/Makefile.orig	2026-05-19 15:03:27 UTC
 +++ deps/linenoise/Makefile
-@@ -1,10 +1,10 @@
+@@ -1,10 +1,10 @@ WARN= -Wall -Werror
  STD=
- WARN= -Wall
+ WARN= -Wall -Werror
 -OPT= -Os
 +#OPT= -Os
  
  R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
  R_LDFLAGS= $(LDFLAGS)
 -DEBUG= -g
 +#DEBUG= -g
  
  R_CC=$(CC) $(R_CFLAGS)
  R_LD=$(CC) $(R_LDFLAGS)
diff --git a/databases/valkey/files/patch-deps_Makefile b/databases/valkey/files/patch-deps_Makefile
index f8fe98e667d5..da147bcabf93 100644
--- a/databases/valkey/files/patch-deps_Makefile
+++ b/databases/valkey/files/patch-deps_Makefile
@@ -1,22 +1,22 @@
---- deps/Makefile.orig	2025-10-21 16:05:42 UTC
+--- deps/Makefile.orig	2026-05-19 15:03:27 UTC
 +++ deps/Makefile
-@@ -90,7 +90,7 @@ else
+@@ -92,7 +92,7 @@ else
  ifeq ($(LUA_DEBUG),yes)
  	LUA_CFLAGS+= -O0 -g -DLUA_USE_APICHECK
  else
--	LUA_CFLAGS+= -O2 
+-	LUA_CFLAGS+= -O2
 +	LUA_CFLAGS+=
  endif
  ifeq ($(LUA_COVERAGE),yes)
  	LUA_CFLAGS += -fprofile-arcs -ftest-coverage
-@@ -118,8 +118,8 @@ jemalloc: .make-prerequisites
+@@ -120,8 +120,8 @@ 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/valkey/files/patch-src_Makefile b/databases/valkey/files/patch-src_Makefile
index 076a6dac403a..9ae9915d5ca9 100644
--- a/databases/valkey/files/patch-src_Makefile
+++ b/databases/valkey/files/patch-src_Makefile
@@ -1,54 +1,54 @@
---- src/Makefile.orig	2025-10-21 16:05:42 UTC
+--- src/Makefile.orig	2026-05-19 15:03:27 UTC
 +++ src/Makefile
 @@ -61,8 +61,8 @@ endif
  	STD+=-std=c99
  endif
  
 -PREFIX?=/usr/local
 -INSTALL_BIN=$(PREFIX)/bin
 +PREFIX:=$(PREFIX)
 +INSTALL_BIN=$(DESTDIR)$(PREFIX)/bin
+ INSTALL_LIB=$(PREFIX)/lib
  INSTALL=install
  PKG_CONFIG?=pkg-config
- 
-@@ -138,7 +138,6 @@ FINAL_LIBS=-lm
+@@ -139,7 +139,6 @@ FINAL_LIBS=-lm
  FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(SERVER_CFLAGS)
  FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(SERVER_LDFLAGS) $(DEBUG)
  FINAL_LIBS=-lm
 -DEBUG=-g -ggdb
  
  # Linux ARM32 needs -latomic at linking time
  ifneq (,$(findstring armv,$(uname_M)))
-@@ -182,6 +181,11 @@ else
+@@ -184,6 +183,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
-@@ -241,6 +245,7 @@ endif
+@@ -247,6 +251,7 @@ endif
  endif
  endif
  endif
 +endif
  
  ifdef OPENSSL_PREFIX
  	OPENSSL_CFLAGS=-I$(OPENSSL_PREFIX)/include
-@@ -642,12 +647,6 @@ install: all
+@@ -850,12 +855,6 @@ install: all $(LUA_MODULE_INSTALL)
  	@ln -sf $(SERVER_NAME) $(INSTALL_BIN)/$(ENGINE_CHECK_RDB_NAME)
  	@ln -sf $(SERVER_NAME) $(INSTALL_BIN)/$(ENGINE_CHECK_AOF_NAME)
  	@ln -sf $(SERVER_NAME) $(INSTALL_BIN)/$(ENGINE_SENTINEL_NAME)
 -	$(call MAYBE_INSTALL_REDIS_SYMLINK,$(SERVER_NAME),$(INSTALL_BIN))
 -	$(call MAYBE_INSTALL_REDIS_SYMLINK,$(ENGINE_CLI_NAME),$(INSTALL_BIN))
 -	$(call MAYBE_INSTALL_REDIS_SYMLINK,$(ENGINE_BENCHMARK_NAME),$(INSTALL_BIN))
 -	$(call MAYBE_INSTALL_REDIS_SYMLINK,$(ENGINE_CHECK_RDB_NAME),$(INSTALL_BIN))
 -	$(call MAYBE_INSTALL_REDIS_SYMLINK,$(ENGINE_CHECK_AOF_NAME),$(INSTALL_BIN))
 -	$(call MAYBE_INSTALL_REDIS_SYMLINK,$(ENGINE_SENTINEL_NAME),$(INSTALL_BIN))
  
- uninstall:
- 	@rm -f $(INSTALL_BIN)/{$(SERVER_NAME),$(ENGINE_BENCHMARK_NAME),$(ENGINE_CLI_NAME),$(ENGINE_CHECK_RDB_NAME),$(ENGINE_CHECK_AOF_NAME),$(ENGINE_SENTINEL_NAME)}
+ install-lua-module: $(LUA_MODULE)
+ 	@mkdir -p $(INSTALL_LIB)