diff --git a/shells/fish/Makefile b/shells/fish/Makefile
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	fish
 DISTVERSION=	3.3.1
+PORTREVISION=	1
 CATEGORIES=	shells
 MASTER_SITES=	https://github.com/fish-shell/fish-shell/releases/download/${PORTVERSION}/
 
@@ -51,6 +52,7 @@
 .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
diff --git a/shells/fish/pkg-plist b/shells/fish/pkg-plist
--- a/shells/fish/pkg-plist
+++ b/shells/fish/pkg-plist
@@ -3,7 +3,7 @@
 bin/fish_key_reader
 share/applications/fish.desktop
 share/pixmaps/fish.png
-%%ETCDIR%%/config.fish
+@sample %%ETCDIR%%/config.fish.sample
 libdata/pkgconfig/fish.pc
 %%MANPAGES%%man/man1/fish.1.gz
 %%MANPAGES%%man/man1/fish_indent.1.gz