diff --git a/ports/irrlicht/vcpkg.json b/ports/irrlicht/vcpkg.json
index 93bab6e65b..1aef42f306 100644
--- a/ports/irrlicht/vcpkg.json
+++ b/ports/irrlicht/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "irrlicht",
   "version": "1.8.5",
+  "port-version": 1,
   "description": "The Irrlicht Engine is an open source realtime 3D engine written in C++. It is cross-platform, using D3D, OpenGL and its own software renderers.",
   "homepage": "http://irrlicht.sourceforge.net",
-  "supports": "!(arm | uwp)",
+  "supports": "!(android | uwp)",
   "dependencies": [
     "bzip2",
     "libjpeg-turbo",
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index bedc1cc687..6a49510f0f 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -448,7 +448,6 @@ intelrdfpmathlib:x64-android=fail
 io2d:arm-neon-android=fail
 io2d:arm64-android=fail
 io2d:x64-android=fail
-irrlicht:x64-android=fail
 isal:x64-android=fail
 # Failing on try_run() in cross builds
 itk:arm-neon-android=fail
diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt
index cdf94a078d..5b86a1b268 100644
--- a/scripts/ci.feature.baseline.txt
+++ b/scripts/ci.feature.baseline.txt
@@ -174,9 +174,7 @@ intel-mkl:x64-osx=fail
 intel-mkl:x64-windows-static-md=fail
 intel-mkl:x64-windows-static=fail
 intel-mkl:x86-windows=fail
-irrlicht:arm-uwp=fail
-irrlicht:arm64-windows=fail
-irrlicht:x64-uwp=fail
+irrlicht[tools]:x64-linux=feature-fails
 ismrmrd:x86-windows=fail
 jemalloc:arm-uwp=fail
 jemalloc:arm64-windows=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index 2b052d19ca..09f2943848 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3942,7 +3942,7 @@
     },
     "irrlicht": {
       "baseline": "1.8.5",
-      "port-version": 0
+      "port-version": 1
     },
     "irrxml": {
       "baseline": "0",
diff --git a/versions/i-/irrlicht.json b/versions/i-/irrlicht.json
index f9d7634c45..20119f9309 100644
--- a/versions/i-/irrlicht.json
+++ b/versions/i-/irrlicht.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ef24b53f59cc9a59d277cbff009156852deb3e5c",
+      "version": "1.8.5",
+      "port-version": 1
+    },
     {
       "git-tree": "708fa654ac49d99ff5c6a3146c806d576b1b94a3",
       "version": "1.8.5",