diff --git a/MOVED b/MOVED
index 854cd07e3c6d..80459e6ab286 100644
--- a/MOVED
+++ b/MOVED
@@ -4328,3 +4328,4 @@ textproc/py-grapheme||2025-04-21|Has expired: Upstream is inactive for 4 years
 devel/p5-threads|lang/perl5.36|2025-04-24|part of Perl core since 5.7.3, the port was from 5.27.8
 databases/replibyte||2025-04-26|incompatible rust 1.86.0 and seems to be dead upstream
 net-im/chatterino2||2025-04-27|Has expired: Broken for more than a month with no available fixes
+shells/oil|shells/oils|2025-04-27|Project was renamed upstream
diff --git a/shells/Makefile b/shells/Makefile
index 50696157abf9..0cdbb9120da3 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -44,7 +44,7 @@
     SUBDIR += nu_plugin_query
     SUBDIR += nushell
     SUBDIR += ohmyzsh
-    SUBDIR += oil
+    SUBDIR += oils
     SUBDIR += oksh
     SUBDIR += p5-Bash-Completion
     SUBDIR += p5-Shell-Perl
diff --git a/shells/oil/Makefile b/shells/oil/Makefile
deleted file mode 100644
index 729a29a3a6eb..000000000000
--- a/shells/oil/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-PORTNAME=	oil
-DISTVERSIONPREFIX=	v
-DISTVERSION=	0.24.0
-CATEGORIES=	shells
-MASTER_SITES=	https://www.oilshell.org/download/
-PKGNAMESUFFIX=	-shell
-DISTNAME=	oils-for-unix-${PORTVERSION}
-
-MAINTAINER=	yuri@FreeBSD.org
-COMMENT=	New Unix shell
-WWW=		https://www.oilshell.org/ \
-		https://github.com/oils-for-unix/oils
-
-LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
-
-USES=		gmake
-
-GNU_CONFIGURE=	yes
-
-PLIST_FILES=	bin/oils-for-unix \
-		bin/osh \
-		bin/ysh \
-		share/man/man1/osh.1.gz
-
-do-build:
-	@cd ${WRKSRC} && \
-		${SETENV} ${MAKE_ENV} _build/oils.sh
-do-install:
-	@cd ${WRKSRC} && \
-		${SETENV} DESTDIR=${STAGEDIR} ./install
-
-.include <bsd.port.mk>
diff --git a/shells/oil/distinfo b/shells/oil/distinfo
deleted file mode 100644
index 016037ed27cf..000000000000
--- a/shells/oil/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1731297386
-SHA256 (oils-for-unix-0.24.0.tar.gz) = df4afed94d53b303a782ce0380c393d60f6d21921ef2a25922b400828add98f3
-SIZE (oils-for-unix-0.24.0.tar.gz) = 829706
diff --git a/shells/oils/Makefile b/shells/oils/Makefile
new file mode 100644
index 000000000000..1c9b052728bd
--- /dev/null
+++ b/shells/oils/Makefile
@@ -0,0 +1,48 @@
+PORTNAME=	oils
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.28.0
+CATEGORIES=	shells
+MASTER_SITES=	https://oils.pub/download/
+PKGNAMESUFFIX=	-shell
+DISTNAME=	oils-for-unix-${PORTVERSION}
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	New Unix shell
+WWW=		https://www.oils.pub/ \
+		https://github.com/oils-for-unix/oils
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+USES=		gmake
+
+OPTIONS_DEFINE=			READLINE LIBC-FEAT SYSTEMTAP-SDT
+OPTIONS_DEFAULT=		READLINE LIBC-FEAT SYSTEMTAP-SDT
+
+READLINE_DESC=			Enable use of GNU readline
+LIBC-FEAT_DESC=			Assume FNM_EXTMATCH, GLOB_PERIOD, *pwent()
+SYSTEMTAP-SDT_DESC=		Compile with systemtap-sdt
+
+READLINE_LIB_DEPENDS=		libreadline.so:devel/readline
+READLINE_CONFIGURE_WITH=	readline
+READLINE_CONFIGURE_ON=		--readline=${LOCALBASE}
+
+LIBC-FEAT_CONFIGURE_WITH=	libc-features
+
+SYSTEMTAP-SDT_CONFIGURE_WITH=	systemtap-sdt
+
+GNU_CONFIGURE=	yes
+
+PLIST_FILES=	bin/oils-for-unix \
+		bin/osh \
+		bin/ysh \
+		share/man/man1/osh.1.gz
+
+do-build:
+	@cd ${WRKSRC} && \
+		${SETENV} ${MAKE_ENV} _build/oils.sh
+do-install:
+	@cd ${WRKSRC} && \
+		${SETENV} DESTDIR=${STAGEDIR} ./install
+
+.include <bsd.port.mk>
diff --git a/shells/oils/distinfo b/shells/oils/distinfo
new file mode 100644
index 000000000000..9e79646da76d
--- /dev/null
+++ b/shells/oils/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1745759202
+SHA256 (oils-for-unix-0.28.0.tar.gz) = 266d14b16d90d4a07fe774881eafa0ecdbbc8411cf1c75f8b6e256370b668e35
+SIZE (oils-for-unix-0.28.0.tar.gz) = 837326
diff --git a/shells/oil/pkg-descr b/shells/oils/pkg-descr
similarity index 100%
rename from shells/oil/pkg-descr
rename to shells/oils/pkg-descr