diff --git a/shells/oksh/Makefile b/shells/oksh/Makefile
index b20851d6a119..cbc3c58f7b71 100644
--- a/shells/oksh/Makefile
+++ b/shells/oksh/Makefile
@@ -1,24 +1,41 @@
 PORTNAME=	oksh
-DISTVERSION=	6.9
+DISTVERSION=	7.0
 PORTEPOCH=	1
 CATEGORIES=	shells
 MASTER_SITES=	https://github.com/ibara/oksh/releases/download/oksh-${DISTVERSION}/
 
 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Portable OpenBSD Korn shell
 
 LICENSE=	PD
 
-HAS_CONFIGURE=	yes
+FLAVORS=	dynamic static
+FLAVOR?=	${FLAVORS:[1]}
 
-OPTIONS_DEFINE=		CURSES STATIC
+static_PKGNAMESUFFIX=	-static
+.if ${FLAVOR} == static
+COMMENT+=		(rescue(8) version)
+.endif
+
+HAS_CONFIGURE=		yes
+.if ${FLAVOR} == static
+CONFIGURE_ARGS+=	--enable-static
+PLIST=			/dev/null
+PLIST_FILES=		"@shell /rescue/oksh"
+.endif
+
+OPTIONS_DEFINE=		CURSES
 OPTIONS_DEFAULT=	CURSES
 
 CURSES_DESC=	Use ncurses for screen clearing routines
 
 CURSES_USES=			ncurses
 CURSES_CONFIGURE_ENABLE=	curses
 
-STATIC_CONFIGURE_ENABLE=	static
+.if ${FLAVOR} == static
+do-install:
+	@${MKDIR} ${STAGEDIR}/rescue
+	${INSTALL_PROGRAM} ${WRKSRC}/oksh ${STAGEDIR}/rescue
+.endif
 
 .include <bsd.port.mk>
diff --git a/shells/oksh/distinfo b/shells/oksh/distinfo
index e73a043997b5..b07a0ab6c869 100644
--- a/shells/oksh/distinfo
+++ b/shells/oksh/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619847915
-SHA256 (oksh-6.9.tar.gz) = c08d97b2ac9ee5d88e9e508d27c75502b2d06c20d4c5ab87b496cb3b9951bd35
-SIZE (oksh-6.9.tar.gz) = 307338
+TIMESTAMP = 1633855474
+SHA256 (oksh-7.0.tar.gz) = 21d5891f38ffea3a5d1aa8c494f0a5579c93778535e0a92275b102dec3221da1
+SIZE (oksh-7.0.tar.gz) = 308707