diff --git a/shells/modernish/Makefile b/shells/modernish/Makefile
index c5e9666474ec..9c9a1e4958b7 100644
--- a/shells/modernish/Makefile
+++ b/shells/modernish/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	modernish
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.16.5
 CATEGORIES=	shells
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	POSIX shell feature detection and language extension library
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	cd ${WRKSRC} && \
-	${SETENV} ${MAKE_ENV} ./install.sh -d ${PREFIX} -D ${STAGEDIR} -n -s ${SH}
+	${SETENV} ${MAKE_ENV} ${SH} -x ./install.sh -d ${PREFIX} -D ${STAGEDIR} -n -s ${SH}
 
 	${RM} ${STAGEDIR}${DOCSDIR}/LICENSE
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR:H}
 	${MV} ${STAGEDIR}${DOCSDIR}/examples ${STAGEDIR}${EXAMPLESDIR}
 	${RLN} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${DOCSDIR}/examples
 
 .include <bsd.port.mk>
diff --git a/shells/modernish/files/patch-install.sh b/shells/modernish/files/patch-install.sh
new file mode 100644
index 000000000000..9f59425be61e
--- /dev/null
+++ b/shells/modernish/files/patch-install.sh
@@ -0,0 +1,11 @@
+--- install.sh.orig	2021-04-15 11:21:11 UTC
++++ install.sh
+@@ -119,7 +119,7 @@ case ${opt_s+s} in
+ 	( * )	MSH_SHELL=$opt_s
+ 		export MSH_SHELL
+ 		echo "Relaunching ${0##*/} with $MSH_SHELL..." >&2
+-		exec "$MSH_SHELL" "$MSH_PREFIX/${0##*/}" --relaunch "$@" ;;
++		exec "$MSH_SHELL" -x "$MSH_PREFIX/${0##*/}" --relaunch "$@" ;;
+ 	esac ;;
+ esac
+