diff --git a/recipes/mp-units/2.5.0/conandata.yml b/recipes/mp-units/2.5.0/conandata.yml
new file mode 100644
index 0000000000000..2e0316dff3dcd
--- /dev/null
+++ b/recipes/mp-units/2.5.0/conandata.yml
@@ -0,0 +1,4 @@
+sources:
+  "2.5.0":
+    url: https://github.com/mpusz/units/archive/v2.5.0.tar.gz
+    sha256: a6bd48bee699f11f0ed5b04b8c5006d15f76e6d898e058db3880554d2e47a400
diff --git a/recipes/mp-units/2.5.0/conanfile.py b/recipes/mp-units/2.5.0/conanfile.py
new file mode 100644
index 0000000000000..ea057a3867b53
--- /dev/null
+++ b/recipes/mp-units/2.5.0/conanfile.py
@@ -0,0 +1,349 @@
+import os
+
+from conan import ConanFile
+from conan.errors import ConanInvalidConfiguration
+from conan.tools.build import valid_min_cppstd
+from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
+from conan.tools.files import copy, get, rmdir
+from conan.tools.scm import Version
+
+required_conan_version = ">=1.59.0"
+
+
+def loose_lt_semver(v1, v2):
+    lv1 = [int(v) for v in v1.split(".")]
+    lv2 = [int(v) for v in v2.split(".")]
+    min_length = min(len(lv1), len(lv2))
+    return lv1[:min_length] < lv2[:min_length]
+
+
+class MPUnitsConan(ConanFile):
+    name = "mp-units"
+    homepage = "https://github.com/mpusz/mp-units"
+    description = "The quantities and units library for C++"
+    topics = (
+        "units",
+        "dimensions",
+        "quantities",
+        "dimensional-analysis",
+        "physical-quantities",
+        "physical-units",
+        "system-of-units",
+        "system-of-quantities",
+        "isq",
+        "si",
+        "library",
+        "quantity-manipulation",
+    )
+    license = "MIT"
+    url = "https://github.com/conan-io/conan-center-index"
+    settings = "os", "arch", "compiler", "build_type"
+    options = {
+        "cxx_modules": [True, False],
+        "import_std": [True, False],
+        "std_format": [True, False],
+        "no_crtp": [True, False],
+        "contracts": ["none", "gsl-lite", "ms-gsl"],
+        "freestanding": [True, False],
+        "natural_units": [True, False],
+    }
+    default_options = {
+        # "cxx_modules" default set in config_options()
+        # "import_std" default set in config_options()
+        # "std_format" default set in config_options()
+        # "no_crtp" default set in config_options()
+        "import_std": False,  # still experimental in CMake
+        "contracts": "gsl-lite",
+        "freestanding": False,
+        "natural_units": True,
+    }
+    no_copy_source = True
+
+    @property
+    def _feature_compatibility(self):
+        return {
+            "minimum_support": {
+                "min_cppstd": "20",
+                "compiler": {
+                    "gcc": "12",
+                    "clang": "16",
+                    "apple-clang": "15",
+                    "msvc": "194",
+                    "Visual Studio": "17",
+                },
+            },
+            "std_format": {
+                "min_cppstd": "20",
+                "compiler": {
+                    "gcc": "13",
+                    "clang": "17",
+                    "apple-clang": "16",
+                    "msvc": "194",
+                    "Visual Studio": "17",
+                },
+            },
+            "cxx_modules": {
+                "min_cppstd": "20",
+                "compiler": {
+                    "gcc": "",
+                    "clang": "17",
+                    "apple-clang": "",
+                    "msvc": "",
+                    "Visual Studio": "",
+                },
+            },
+            "import_std": {
+                "min_cppstd": "23",
+                "compiler": {
+                    "gcc": "",
+                    "clang": "18",
+                    "apple-clang": "",
+                    "msvc": "",
+                    "Visual Studio": "",
+                },
+            },
+            "explicit_this": {
+                "min_cppstd": "23",
+                "compiler": {
+                    "gcc": "14",
+                    "clang": "18",
+                    "apple-clang": "17",
+                    "msvc": "194",
+                    "Visual Studio": "",
+                },
+            },
+        }
+
+    @property
+    def _option_feature_map(self):
+        return {
+            "std_format": "std_format",
+            "cxx_modules": "cxx_modules",
+            # "import_std": "import_std",  # still experimental in CMake
+            "no_crtp": "explicit_this",
+        }
+
+    def _set_default_option(self, name):
+        compiler = self.settings.compiler
+        feature_name = self._option_feature_map[name]
+        feature = self._feature_compatibility[feature_name]
+        min_version = feature["compiler"].get(str(compiler))
+        setattr(
+            self.options,
+            name,
+            bool(
+                min_version
+                and Version(compiler.version) >= min_version
+                and valid_min_cppstd(self, feature["min_cppstd"])
+            ),
+        )
+
+    def _check_feature_supported(self, name, feature_name=name):
+        compiler = self.settings.compiler
+        cppstd = compiler.get_safe("cppstd")
+        feature = self._feature_compatibility[feature_name]
+
+        # check C++ version
+        if cppstd and not valid_min_cppstd(self, feature["min_cppstd"]):
+            raise ConanInvalidConfiguration(
+                f"'{name}' requires at least cppstd={feature['min_cppstd']} ({cppstd} in use)",
+            )
+
+        # check compiler version
+        min_version = feature["compiler"].get(str(compiler))
+        if min_version == None:
+            # not tested compiler being used - use at your own risk
+            return
+        if min_version == "":
+            raise ConanInvalidConfiguration(
+                f"'{name}' is not yet supported by any known {compiler} version"
+            )
+        if loose_lt_semver(str(compiler.version), min_version):
+            raise ConanInvalidConfiguration(
+                f"'{name}' requires at least {compiler}-{min_version} ({compiler}-{compiler.version} in use)"
+            )
+
+    def config_options(self):
+        for key in self._option_feature_map.keys():
+            self._set_default_option(key)
+        # TODO mixing of `import std;` and regular header files includes does not work for now
+        if self.options.import_std:
+            self.options.contracts = "none"
+
+    def configure(self):
+        if self.options.cxx_modules:
+            self.package_type = "static-library"
+        else:
+            self.package_type = "header-library"
+        if self.options.freestanding:
+            self.options.rm_safe("std_format")
+
+    def requirements(self):
+        if not self.options.freestanding:
+            if self.options.contracts == "gsl-lite":
+                self.requires("gsl-lite/1.0.1", transitive_headers=True)
+            elif self.options.contracts == "ms-gsl":
+                self.requires("ms-gsl/4.2.0", transitive_headers=True)
+            if not self.options.std_format:
+                self.requires("fmt/12.1.0", transitive_headers=True)
+
+    def build_requirements(self):
+        self.tool_requires("cmake/[>=4.2.1 <5]")
+
+    def validate(self):
+        compiler = self.settings.compiler
+        if compiler == "clang" and Version(compiler.version).major == 19:
+            raise ConanInvalidConfiguration(
+                "clang-19 does not build mp-units because of an unfixable bug in the compiler."
+            )
+        if compiler == "apple-clang" and Version(compiler.version).major == 17:
+            raise ConanInvalidConfiguration(
+                "apple-clang-17 (Xcode 16.3+) does not build mp-units "
+                + "because it has the same unfixable bug as clang-19."
+            )
+
+        self._check_feature_supported("mp-units", "minimum_support")
+        for key, value in self._option_feature_map.items():
+            if self.options.get_safe(key) == True:
+                self._check_feature_supported(key, value)
+        if self.options.freestanding and self.options.contracts != "none":
+            raise ConanInvalidConfiguration(
+                "'contracts' should be set to 'none' for a freestanding build"
+            )
+        # TODO mixing of `import std;` and regular header files includes does not work for now
+        if self.options.import_std:
+            if self.options.contracts != "none":
+                raise ConanInvalidConfiguration(
+                    "'contracts' should be set to 'none' to use `import std;`"
+                )
+            if not self.options.get_safe("std_format", default=True):
+                raise ConanInvalidConfiguration(
+                    "'std_format' should be enabled to use `import std;`"
+                )
+
+    def layout(self):
+        cmake_layout(self, src_folder="src")
+
+    def source(self):
+        get(self, **self.conan_data["sources"][self.version], strip_root=True)
+
+    def generate(self):
+        opt = self.options
+        tc = CMakeToolchain(self)
+        tc.cache_variables["MP_UNITS_BUILD_CXX_MODULES"] = opt.cxx_modules
+        if opt.cxx_modules:
+            tc.cache_variables["CMAKE_CXX_SCAN_FOR_MODULES"] = True
+        if opt.import_std:
+            tc.cache_variables["CMAKE_CXX_MODULE_STD"] = True
+            # Current experimental support according to `Help/dev/experimental.rst`
+            tc.cache_variables["CMAKE_EXPERIMENTAL_CXX_IMPORT_STD"] = (
+                "d0edc3af-4c50-42ea-a356-e2862fe7a444"
+            )
+
+        # TODO remove the below when Conan will learn to handle C++ modules
+        if opt.freestanding:
+            tc.cache_variables["MP_UNITS_API_FREESTANDING"] = True
+            # Fix for freestanding builds: CMake compiler tests fail when linking with -ffreestanding
+            # Set CMAKE_TRY_COMPILE_TARGET_TYPE to STATIC_LIBRARY to avoid linking during compiler tests
+            tc.cache_variables["CMAKE_TRY_COMPILE_TARGET_TYPE"] = "STATIC_LIBRARY"
+        else:
+            tc.cache_variables["MP_UNITS_API_STD_FORMAT"] = opt.std_format
+        tc.cache_variables["MP_UNITS_API_NO_CRTP"] = opt.no_crtp
+        tc.cache_variables["MP_UNITS_API_CONTRACTS"] = str(opt.contracts).upper()
+        tc.cache_variables["MP_UNITS_API_NATURAL_UNITS"] = opt.natural_units
+
+        tc.generate()
+        deps = CMakeDeps(self)
+        deps.generate()
+
+    def build(self):
+        cmake = CMake(self)
+        cmake.configure(build_script_folder="src")
+        if self.options.cxx_modules:
+            cmake.build()
+
+    def package_id(self):
+        if self.package_type == "header-library":
+            self.info.clear()
+
+    def package(self):
+        copy(
+            self,
+            "LICENSE.md",
+            self.source_folder,
+            os.path.join(self.package_folder, "licenses"),
+        )
+        cmake = CMake(self)
+        cmake.install()
+        # TODO remove the below when Conan will learn to handle C++ modules
+        if not self.options.cxx_modules:
+            # We have to preserve those files for C++ modules build as Conan
+            # can't generate such CMake targets for now
+            rmdir(self, os.path.join(self.package_folder, "lib", "cmake"))
+
+    def package_info(self):
+        compiler = self.settings.compiler
+        # TODO remove the branch when Conan will learn to handle C++ modules
+        if self.options.cxx_modules:
+            # CMakeDeps does not generate C++ modules definitions for now
+            # Skip the Conan-generated files and use the mp-unitsConfig.cmake bundled with mp-units
+            self.cpp_info.set_property("cmake_find_mode", "none")
+            self.cpp_info.builddirs = ["."]
+        else:
+            # handle contracts
+            if self.options.contracts == "none":
+                self.cpp_info.components["core"].defines.append(
+                    "MP_UNITS_API_CONTRACTS=0"
+                )
+            elif self.options.contracts == "gsl-lite":
+                self.cpp_info.components["core"].requires.append("gsl-lite::gsl-lite")
+                self.cpp_info.components["core"].defines.append(
+                    "MP_UNITS_API_CONTRACTS=2"
+                )
+            elif self.options.contracts == "ms-gsl":
+                self.cpp_info.components["core"].requires.append("ms-gsl::ms-gsl")
+                self.cpp_info.components["core"].defines.append(
+                    "MP_UNITS_API_CONTRACTS=3"
+                )
+
+            # handle API options
+            self.cpp_info.components["core"].defines.append(
+                "MP_UNITS_API_NO_CRTP=" + str(int(self.options.no_crtp == True))
+            )
+            self.cpp_info.components["core"].defines.append(
+                "MP_UNITS_API_NATURAL_UNITS="
+                + str(int(self.options.natural_units == True))
+            )
+
+            # handle hosted configuration
+            if self.options.freestanding:
+                self.cpp_info.components["core"].defines.append("MP_UNITS_HOSTED=0")
+            else:
+                self.cpp_info.components["core"].defines.append("MP_UNITS_HOSTED=1")
+                if not self.options.std_format:
+                    self.cpp_info.components["core"].requires.append("fmt::fmt")
+                self.cpp_info.components["core"].defines.append(
+                    "MP_UNITS_API_STD_FORMAT="
+                    + str(int(self.options.std_format == True))
+                )
+
+            # handle import std
+            if self.options.import_std:
+                self.cpp_info.components["core"].defines.append("MP_UNITS_IMPORT_STD")
+                if compiler == "clang" and Version(compiler.version) < 19:
+                    self.cpp_info.components["core"].cxxflags.append(
+                        "-Wno-deprecated-declarations"
+                    )
+
+            if compiler == "msvc":
+                self.cpp_info.components["core"].cxxflags.append("/utf-8")
+
+            self.cpp_info.components["systems"].requires = ["core"]
+
+            # https://github.com/llvm/llvm-project/issues/131410
+            if (
+                compiler == "clang"
+                and Version(compiler.version).major == 20
+                and Version(compiler.version).minor == 1
+            ):
+                self.cpp_info.components["core"].cxxflags.append("-Wno-unused-result")
diff --git a/recipes/mp-units/2.5.0/test_package/CMakeLists.txt b/recipes/mp-units/2.5.0/test_package/CMakeLists.txt
new file mode 100644
index 0000000000000..408bcac530b84
--- /dev/null
+++ b/recipes/mp-units/2.5.0/test_package/CMakeLists.txt
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 3.30.5)
+project(test_package LANGUAGES CXX)
+
+message(STATUS "MP_UNITS_BUILD_CXX_MODULES: ${MP_UNITS_BUILD_CXX_MODULES}")
+
+find_package(mp-units REQUIRED)
+
+add_executable(test_package-headers test_package.cpp)
+target_compile_features(test_package-headers PRIVATE $<IF:$<BOOL:${CMAKE_CXX_MODULE_STD}>,cxx_std_23,cxx_std_20>)
+target_link_libraries(test_package-headers PRIVATE mp-units::mp-units)
diff --git a/recipes/mp-units/2.5.0/test_package/conanfile.py b/recipes/mp-units/2.5.0/test_package/conanfile.py
new file mode 100644
index 0000000000000..4cbe6e4b434b7
--- /dev/null
+++ b/recipes/mp-units/2.5.0/test_package/conanfile.py
@@ -0,0 +1,44 @@
+import os
+
+from conan import ConanFile
+from conan.tools.build import can_run
+from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
+
+
+class TestPackageConan(ConanFile):
+    settings = "os", "arch", "compiler", "build_type"
+    generators = "CMakeDeps"
+    test_type = "explicit"
+
+    def requirements(self):
+        self.requires(self.tested_reference_str)
+
+    def build_requirements(self):
+        self.tool_requires("cmake/[>=4.2.1 <5]")
+
+    def layout(self):
+        cmake_layout(self)
+
+    def generate(self):
+        tc = CMakeToolchain(self)
+        opt = self.dependencies["mp-units"].options
+        tc.cache_variables["MP_UNITS_BUILD_CXX_MODULES"] = opt.cxx_modules
+        if opt.cxx_modules:
+            tc.cache_variables["CMAKE_CXX_SCAN_FOR_MODULES"] = True
+        if opt.import_std:
+            tc.cache_variables["CMAKE_CXX_MODULE_STD"] = True
+            # Current experimental support according to `Help/dev/experimental.rst`
+            tc.cache_variables["CMAKE_EXPERIMENTAL_CXX_IMPORT_STD"] = (
+                "d0edc3af-4c50-42ea-a356-e2862fe7a444"
+            )
+        tc.generate()
+
+    def build(self):
+        cmake = CMake(self)
+        cmake.configure()
+        cmake.build()
+
+    def test(self):
+        if can_run(self):
+            bin_path = os.path.join(self.cpp.build.bindirs[0], "test_package-headers")
+            self.run(bin_path, env="conanrun")
diff --git a/recipes/mp-units/2.5.0/test_package/test_package.cpp b/recipes/mp-units/2.5.0/test_package/test_package.cpp
new file mode 100644
index 0000000000000..16fa4f9ee6670
--- /dev/null
+++ b/recipes/mp-units/2.5.0/test_package/test_package.cpp
@@ -0,0 +1,36 @@
+#include <mp-units/compat_macros.h>
+
+#if MP_UNITS_HOSTED
+#include <mp-units/ext/format.h>
+#ifdef MP_UNITS_IMPORT_STD
+import std;
+#else
+#include <iostream>
+#endif
+#endif
+
+#ifdef MP_UNITS_MODULES
+import mp_units;
+#else
+#include <mp-units/systems/isq.h>
+#include <mp-units/systems/si.h>
+#endif
+
+using namespace mp_units;
+
+constexpr QuantityOf<MP_UNITS_IS_VALUE_WORKAROUND(isq::speed)> auto avg_speed(
+  QuantityOf<MP_UNITS_IS_VALUE_WORKAROUND(isq::distance)> auto d,
+  QuantityOf<MP_UNITS_IS_VALUE_WORKAROUND(isq::duration)> auto t)
+{
+  return d / t;
+}
+
+int main()
+{
+  using namespace mp_units::si::unit_symbols;
+#if MP_UNITS_HOSTED
+  std::cout << MP_UNITS_STD_FMT::format("Average speed = {}\n", avg_speed(240 * km, 2 * h));
+#else
+  [[maybe_unused]] auto value = avg_speed(240 * km, 2 * h);
+#endif
+}
diff --git a/recipes/mp-units/config.yml b/recipes/mp-units/config.yml
index 65cd632824585..7ef85c1561a11 100644
--- a/recipes/mp-units/config.yml
+++ b/recipes/mp-units/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "2.5.0":
+    folder: 2.5.0
   "2.4.0":
     folder: 2.3.0
   "2.3.0":