diff --git a/ports/fmi4cpp/CONTROL b/ports/fmi4cpp/CONTROL
index 35090616d1..38d3b8e7f5 100644
--- a/ports/fmi4cpp/CONTROL
+++ b/ports/fmi4cpp/CONTROL
@@ -1,4 +1,10 @@
 Source: fmi4cpp
-Version: 0.4.0
+Version: 0.5.3
 Description: FMI 2.0 implementation written in modern C++
-Build-Depends: boost-property-tree, boost-ublas, boost-odeint, bzip2 (linux), openssl (linux), libzip
+Build-Depends: boost-property-tree, bzip2 (linux), openssl (linux), libzip, spdlog
+
+Feature: odeint
+Build-Depends: boost-ublas, boost-odeint
+Description: Adds support for wrapping Model Exchange models as Co-simulation models using odeint solvers
+
+
diff --git a/ports/fmi4cpp/portfile.cmake b/ports/fmi4cpp/portfile.cmake
index 435ab2c51f..676efea3ee 100644
--- a/ports/fmi4cpp/portfile.cmake
+++ b/ports/fmi4cpp/portfile.cmake
@@ -14,18 +14,25 @@ include(vcpkg_common_functions)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO SFI-Mechatronics/FMI4cpp
-    REF v0.4.0
-    SHA512 356485da5799a5720b3bea9bd935a76c36eb5c242cecfd2325f47175bad0eafa1e088fb1b96b639b8419e2a5a39f7b07fbe9d89d3f8e568e00b8910b7e991111
+    REPO NTNU-IHB/FMI4cpp
+    REF v0.5.3
+    SHA512 1c62f1fce4d3c0c18bc0a470827be13bc143ec8152ac75781e4d61d332b97389afc5943001e7cb8ae0ea7ebc141d88b00033de73a3d5696923a3f1c05f8ff904
     HEAD_REF master
 )
 
+set(WITH_ODEINT OFF)
+if("odeint" IN_LIST FEATURES)
+    set(WITH_ODEINT ON)
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA # Disable this option if project cannot be built with Ninja
+    PREFER_NINJA
     OPTIONS 
+        -DFMI4CPP_BUILD_TOOL=OFF
         -DFMI4CPP_BUILD_TESTS=OFF
         -DFMI4CPP_BUILD_EXAMPLES=OFF
+	-DFMI4CPP_WITH_ODEINT=${WITH_ODEINT}
 )
 
 vcpkg_install_cmake()
@@ -37,4 +44,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/fmi4cpp RENAME copyright)
 
-vcpkg_copy_pdbs()
\ No newline at end of file
+vcpkg_copy_pdbs()