diff --git a/shells/fish/Makefile b/shells/fish/Makefile
index bb41c40ac9d38..48b796aced883 100644
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -1,8 +1,12 @@
 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/
diff --git a/shells/fish/distinfo b/shells/fish/distinfo
index 4297df8737bb2..daa75ddae7d2d 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