diff --git a/MOVED b/MOVED
index 2c424082b2e6..c25ce4ad63f2 100644
--- a/MOVED
+++ b/MOVED
@@ -16773,3 +16773,4 @@ devel/maven31|devel/maven|2022-01-15|Has expired: Outdated, unsupported upstream
 devel/wasi-compiler-rt12||2022-01-15|Has expired: this ports exists solely for building Firefox 95+ in 2021Q4
 devel/e2fsprogs-libss||2022-01-17|Folded back into sysutils/e2fsprogs, which was the sole user
 lang/spidermonkey60|lang/spidermonkey78|2022-01-18|Has expired: Requires python2 to build
+shells/ammonite|devel/ammonite|2022-01-18|Ammonite dropped built-in shell support
diff --git a/devel/Makefile b/devel/Makefile
index 8d9b1b5738e1..12f473d9166d 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -149,6 +149,7 @@
     SUBDIR += allegro5
     SUBDIR += alog
     SUBDIR += aml
+    SUBDIR += ammonite
     SUBDIR += amqp-cpp
     SUBDIR += android-tools-adb
     SUBDIR += android-tools-fastboot
diff --git a/shells/ammonite/Makefile b/devel/ammonite/Makefile
similarity index 93%
rename from shells/ammonite/Makefile
rename to devel/ammonite/Makefile
index bcab6b71ccaf..72172ba8ebc4 100644
--- a/shells/ammonite/Makefile
+++ b/devel/ammonite/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ammonite
-DISTVERSION=	2.5.0
-CATEGORIES=	shells java
+DISTVERSION=	2.5.1
+CATEGORIES=	devel java
 MASTER_SITES=	https://github.com/lihaoyi/Ammonite/releases/download/${PORTVERSION}/
 DISTNAME=	2.13-${PORTVERSION}
 EXTRACT_SUFX=
diff --git a/devel/ammonite/distinfo b/devel/ammonite/distinfo
new file mode 100644
index 000000000000..610ffb75ee84
--- /dev/null
+++ b/devel/ammonite/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1642522194
+SHA256 (ammonite/2.13-2.5.1) = aeaf122ed8f4adbdf9bdcbcfb02ce10c647ddc48c7a14e8a021123b3658803aa
+SIZE (ammonite/2.13-2.5.1) = 48408804
diff --git a/shells/ammonite/pkg-descr b/devel/ammonite/pkg-descr
similarity index 100%
rename from shells/ammonite/pkg-descr
rename to devel/ammonite/pkg-descr
diff --git a/devel/ammonite/pkg-message b/devel/ammonite/pkg-message
new file mode 100644
index 000000000000..d4757da96fbd
--- /dev/null
+++ b/devel/ammonite/pkg-message
@@ -0,0 +1,18 @@
+[
+{ type: install
+  message: <<EOM
+To use ammonite fully you should setup a configuration file
+~/.ammonite/predef.sc. Below is an example:
+
+interp.load.ivy("com.lihaoyi"   %% "os-lib"    % "0.8.0")
+interp.load.ivy("org.typelevel" %% "cats-core" % "2.7.0")
+
+// This @ is necessary for Ammonite to process the `interp.load.ivy`
+// before continuing.
+@
+import cats._
+import cats.data._
+import cats.syntax.all._
+EOM
+}
+]
diff --git a/shells/Makefile b/shells/Makefile
index da8ecaf614c2..b3a1825991d5 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -1,7 +1,6 @@
     COMMENT = Shells
 
     SUBDIR += 44bsd-csh
-    SUBDIR += ammonite
     SUBDIR += anongitssh
     SUBDIR += antibody
     SUBDIR += ast-ksh
diff --git a/shells/ammonite/distinfo b/shells/ammonite/distinfo
deleted file mode 100644
index 7c8d111db107..000000000000
--- a/shells/ammonite/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1639380918
-SHA256 (ammonite/2.13-2.5.0) = 9799063cff2db988b5eadeaef19780639e32a80589651e54ba8a52190ebdbfd6
-SIZE (ammonite/2.13-2.5.0) = 48405047
diff --git a/shells/ammonite/pkg-message b/shells/ammonite/pkg-message
deleted file mode 100644
index eda1d943cdce..000000000000
--- a/shells/ammonite/pkg-message
+++ /dev/null
@@ -1,25 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-To use ammonite as a shell you must(!) setup a configuration file
-~/.ammonite/predef.sc with a least the following minimal content:
-
-interp.load.ivy(
-  "com.lihaoyi" %% "ammonite-ops" % ammonite.Constants.version
-)
-interp.load.ivy(
-  "com.lihaoyi" %
-  s"ammonite-shell_${scala.util.Properties.versionNumberString}" %
-  ammonite.Constants.version
-)
-// This @ is necessary for Ammonite to process the `interp.load.ivy`
-// before continuing.
-@
-val shellSession = ammonite.shell.ShellSession()
-import shellSession._
-import ammonite.ops._
-import ammonite.shell._
-ammonite.shell.Configure(interp, repl, wd)
-EOM
-}
-]