diff --git a/ports/irrlicht/CMakeLists.txt b/ports/irrlicht/CMakeLists.txt
index cc6edc785b5916..bd472fee82e141 100644
--- a/ports/irrlicht/CMakeLists.txt
+++ b/ports/irrlicht/CMakeLists.txt
@@ -119,7 +119,15 @@ if(IRR_BUILD_TOOLS)
     target_link_libraries(GUIEditor     Irrlicht)
 
     add_executable(FontTool             ${IRR_TOOL_FILES_FONT_TOOL})
-    target_link_libraries(FontTool      Irrlicht)
+    if(UNIX)
+        find_package(Freetype REQUIRED)
+        find_package(Fontconfig REQUIRED)
+        find_package(PkgConfig REQUIRED)
+        pkg_check_modules(XFT REQUIRED xft)
+        target_link_libraries(FontTool      Irrlicht ${XFT_LIBRARIES}  Freetype::Freetype Fontconfig::Fontconfig)
+    else()
+        target_link_libraries(FontTool      Irrlicht)
+    endif()
 
     add_executable(MeshConverter        ${IRR_TOOL_FILES_MESH_CONVERTER})
     target_link_libraries(MeshConverter Irrlicht)
diff --git a/ports/irrlicht/portfile.cmake b/ports/irrlicht/portfile.cmake
index 4bea3839d2b14b..0d3595f3ec4c19 100644
--- a/ports/irrlicht/portfile.cmake
+++ b/ports/irrlicht/portfile.cmake
@@ -14,8 +14,9 @@ if(VCPKG_TARGET_IS_LINUX)
 "Irrlicht currently requires the following libraries from the system package manager:
     libgl1-mesa
     xf86vmode
+    libxft
 
-These can be installed on Ubuntu systems via sudo apt-get install libgl1-mesa-dev libxxf86vm-dev")
+These can be installed on Ubuntu systems via sudo apt-get install libgl1-mesa-dev libxxf86vm-dev libxft-dev")
 endif()
 
 configure_file("${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" "${SOURCE_PATH}/CMakeLists.txt" COPYONLY)
diff --git a/ports/irrlicht/vcpkg.json b/ports/irrlicht/vcpkg.json
index 93bab6e65bec92..23bf18a440cb78 100644
--- a/ports/irrlicht/vcpkg.json
+++ b/ports/irrlicht/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "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)",
@@ -8,6 +9,7 @@
     "bzip2",
     "libjpeg-turbo",
     "libpng",
+    "pkgconf",
     "vcpkg-cmake",
     "vcpkg-cmake-config",
     "zlib"
@@ -17,7 +19,12 @@
       "description": "Enable fast maths (at the expense of precision)"
     },
     "tools": {
-      "description": "Build the Tools FileToHeader, FontTool, GUIEditor and MeshConverter"
+      "description": "Build the Tools FileToHeader, FontTool, GUIEditor and MeshConverter",
+      "dependencies": [
+        "fontconfig",
+        "freetype",
+        "libxft"
+      ]
     },
     "unicode": {
       "description": "Support unicode path on windows"
diff --git a/versions/baseline.json b/versions/baseline.json
index 88b83b1a922956..7feabe0e14da57 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3746,7 +3746,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 f9d7634c454f8a..42ea03fd5f7b3e 100644
--- a/versions/i-/irrlicht.json
+++ b/versions/i-/irrlicht.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "149031b45e94fc2fc4997d5ee1de187defb07f5d",
+      "version": "1.8.5",
+      "port-version": 1
+    },
     {
       "git-tree": "708fa654ac49d99ff5c6a3146c806d576b1b94a3",
       "version": "1.8.5",