diff --git a/shells/fish/Makefile b/shells/fish/Makefile
index bb41c40ac9d3..48b796aced88 100644
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -1,54 +1,58 @@
 PORTNAME=	fish
 DISTVERSION=	3.6.1
+PORTREVISION=	1
 CATEGORIES=	shells
 MASTER_SITES=	https://github.com/fish-shell/fish-shell/releases/download/${PORTVERSION}/
 
+PATCH_SITES=	https://github.com/fish-shell/fish-shell/commit/
+PATCHFILES+=	85504ca694ae099f023ae0febb363238d9c64e8d.patch:-p1
+
 MAINTAINER=	asomers@FreeBSD.org
 COMMENT=	User friendly command line shell
 WWW=		https://fishshell.com/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpcre2-32.so:devel/pcre2
 
 # The python dependency is only needed by shebangfix.  At runtime python is
 # only needed by some optional scripts that aren't in PATH.
 USES=		cmake compiler:c++11-lang cpe localbase ncurses python:env \
 		shebangfix tar:xz
 CPE_VENDOR=	fishshell
 SHEBANG_FILES=	share/tools/*.py share/tools/web_config/webconfig.py
 
 CONFLICTS_INSTALL=	comms/mlan3
 
 MANDIRS=	${DATADIR}/man/man1
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=		DOCS MANPAGES NLS
 OPTIONS_DEFAULT=	MANPAGES NLS
 OPTIONS_SUB=		yes
 
 DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx@${PY_FLAVOR}
 DOCS_CMAKE_BOOL=	BUILD_DOCS
 DOCS_VARS=		MAKE_JOBS_UNSAFE=yes
 
 NLS_USES=	gettext
 NLS_CMAKE_BOOL=	WITH_GETTEXT
 
 .include <bsd.port.pre.mk>
 
 .if ${NCURSESBASE:M${LOCALBASE}}
 CMAKE_ARGS+=	-DCURSES_NEED_NCURSES=TRUE
 .endif
 
 post-install:
 .for i in fish fish_indent fish_key_reader
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}
 .endfor
 	@${MV} ${STAGEDIR}${ETCDIR}/config.fish ${STAGEDIR}${ETCDIR}/config.fish.sample
 
 post-stage-DOCS-on:
 	@${RM} ${STAGEDIR}${DOCSDIR}/.buildinfo
 
 .include <bsd.port.post.mk>
diff --git a/shells/fish/distinfo b/shells/fish/distinfo
index 4297df8737bb..daa75ddae7d2 100644
--- a/shells/fish/distinfo
+++ b/shells/fish/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1684723601
+TIMESTAMP = 1693954987
 SHA256 (fish-3.6.1.tar.xz) = 55402bb47ca6739d8aba25e41780905b5ce1bce0a5e0dd17dca908b5bc0b49b2
 SIZE (fish-3.6.1.tar.xz) = 2866100
+SHA256 (85504ca694ae099f023ae0febb363238d9c64e8d.patch) = c8e3395463dab5d7b5a68fe8a16ef47b9aaef5a983ba909e9c132159290a5f08
+SIZE (85504ca694ae099f023ae0febb363238d9c64e8d.patch) = 1505