diff --git a/ports/intel-mkl/copy-from-dmg.cmake b/ports/intel-mkl/copy-from-dmg.cmake
new file mode 100644
index 00000000000000..a5aa67cdea9e55
--- /dev/null
+++ b/ports/intel-mkl/copy-from-dmg.cmake
@@ -0,0 +1,53 @@
+find_program(HDIUTIL NAMES hdiutil REQUIRED)
+set(dmg_path "NOTFOUND" CACHE FILEPATH "Where to find the DMG")
+set(output_dir "output_dir" CACHE FILEPATH "Where to put the packages")
+
+if(NOT EXISTS "${dmg_path}")
+    message(FATAL_ERROR "'dmg_path' (${dmg_path}) does not exist.")
+endif()
+if(NOT IS_DIRECTORY "${output_dir}")
+    message(FATAL_ERROR "'output_dir' (${output_dir}) is not a directory.")
+endif()
+
+execute_process(
+    COMMAND mktemp -d
+    RESULT_VARIABLE mktemp_result
+    OUTPUT_VARIABLE mount_point
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+if(NOT mktemp_result STREQUAL "0")
+    message(FATAL_ERROR "mktemp -d failed: ${mktemp_result}")
+elseif(NOT IS_DIRECTORY "${mount_point}")
+    message(FATAL_ERROR "'mount_point' (${mount_point}) is not a directory.")
+endif()
+
+execute_process(
+    COMMAND "${HDIUTIL}" attach "${dmg_path}" -mountpoint "${mount_point}" -readonly
+    RESULT_VARIABLE mount_result
+)
+if(mount_result STREQUAL "0")
+    set(dmg_packages_dir "${mount_point}/bootstrapper.app/Contents/Resources/packages")
+    file(GLOB packages
+        "${dmg_packages_dir}/intel.oneapi.mac.mkl.devel,*"
+        "${dmg_packages_dir}/intel.oneapi.mac.mkl.runtime,*"
+        "${dmg_packages_dir}/intel.oneapi.mac.mkl.product,*"
+        "${dmg_packages_dir}/intel.oneapi.mac.openmp,*"
+    )
+    # Using execute_process to avoid direct errors
+    execute_process(
+        COMMAND cp -R ${packages} "${output_dir}/"
+        RESULT_VARIABLE copy_result
+    )
+endif()
+execute_process(
+    COMMAND "${HDIUTIL}" detach "${mount_point}"
+    RESULT_VARIABLE unmount_result
+)
+
+if(NOT mount_result STREQUAL "0")
+    message(FATAL_ERROR "Mounting ${dmg_path} failed: ${mount_result}")
+elseif(NOT copy_result STREQUAL "0")
+    message(FATAL_ERROR "Coyping packages failed: ${copy_result}")
+elseif(NOT unmount_result STREQUAL "0")
+    message(FATAL_ERROR "Unounting ${dmg_path} failed: ${unmount_result}")
+endif()
diff --git a/ports/intel-mkl/portfile.cmake b/ports/intel-mkl/portfile.cmake
index 949431e79428e2..0e76f77ecc5a77 100644
--- a/ports/intel-mkl/portfile.cmake
+++ b/ports/intel-mkl/portfile.cmake
@@ -1,88 +1,83 @@
-# This package installs Intel MKL on Linux and Windows for x64 and on other platforms tries to search for it.
-# The installation for the platforms are:
-#   - Windows: ilp64, intel_thread (!static_crt), sequential(static_crt)
-#   - Linux: ilp64, intel_thread
+# This package installs Intel MKL on Linux, macOS and Windows for x64.
+# Configuration:
+#   - ilp64
+#   - dynamic CRT: intel_thread, static CRT: sequential
 
 set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 
-set(MKL_REQUIRED_VERSION "20200000")
-
 # https://registrationcenter-download.intel.com/akdlm/IRC_NAS/19150/w_onemkl_p_2023.0.0.25930_offline.exe # windows
 # https://registrationcenter-download.intel.com/akdlm/IRC_NAS/19116/m_onemkl_p_2023.0.0.25376_offline.dmg # macos
 # https://registrationcenter-download.intel.com/akdlm/irc_nas/19138/l_onemkl_p_2023.0.0.25398_offline.sh # linux
 set(sha "")
-if(VCPKG_TARGET_IS_WINDOWS)
+if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+  # nop
+elseif(VCPKG_TARGET_IS_WINDOWS)
   set(filename w_onemkl_p_2023.0.0.25930_offline.exe)
   set(magic_number 19150)
   set(sha a3eb6b75241a2eccb73ed73035ff111172c55d3fa51f545c7542277a155df84ff72fc826621711153e683f84058e64cb549c030968f9f964531db76ca8a3ed46)
-elseif(VCPKG_TARGET_IS_OSX AND 0)
+  set(package_infix "win")
+elseif(VCPKG_TARGET_IS_OSX)
   set(filename m_onemkl_p_2023.0.0.25376_offline.dmg)
   set(magic_number 19116)
   set(sha 7b9b8c004054603e6830fb9b9c049d5a4cfc0990c224cb182ac5262ab9f1863775a67491413040e3349c590e2cca58edcfc704db9f3b9f9faa8b5b09022cd2af)
-  # This is a disk image: If somebody knows how to extract it please do so. 
+  set(package_infix "mac")
+  set(package_libdir "lib")
+  set(compiler_libdir "mac/compiler/lib")
 elseif(VCPKG_TARGET_IS_LINUX)
   set(filename l_onemkl_p_2023.0.0.25398_offline.sh)
   set(magic_number 19138)
   set(sha b5f2f464675f0fd969dde2faf2e622b834eb1cc406c4a867148116f6c24ba5c709d98b678840f4a89a1778e12cde0ff70ce2ef59faeef3d3f3aa1d0329c71af1)
-else()
-  set(ProgramFilesx86 "ProgramFiles(x86)")
-  set(INTEL_ROOT $ENV{${ProgramFilesx86}}/IntelSWTools/compilers_and_libraries/windows)
-  set(ONEMKL_ROOT $ENV{${ProgramFilesx86}}/Intel/oneAPI/mkl/latest)
-
-  find_path(MKL_ROOT include/mkl.h
-      PATHS
-      $ENV{MKLROOT}
-      ${INTEL_ROOT}/mkl
-      $ENV{ONEAPI_ROOT}/mkl/latest
-      ${ONEMKL_ROOT}
-      DOC
-      "Folder contains MKL")
-
-  if (MKL_ROOT STREQUAL "MKL_ROOT-NOTFOUND")
-      message(FATAL_ERROR "Could not find MKL. Before continuing, please download and install MKL  (${MKL_REQUIRED_VERSION} or higher) from:"
-                          "\n    https://registrationcenter.intel.com/en/products/download/3178/\n"
-                          "\nAlso ensure vcpkg has been rebuilt with the latest version (v0.0.104 or later)")
-  endif()
+  set(package_infix "lin")
+  set(package_libdir "lib/intel64")
+  set(compiler_libdir "linux/compiler/lib/intel64_lin")
+endif()
 
-  file(STRINGS "${MKL_ROOT}/include/mkl_version.h" MKL_VERSION_DEFINITION REGEX "INTEL_MKL_VERSION")
-  string(REGEX MATCH "([0-9]+)" MKL_VERSION ${MKL_VERSION_DEFINITION})
+if(NOT sha)
+  message(WARNING "${PORT} is empty for ${TARGET_TRIPLET}.")
+  return()
+endif()
 
-  if (MKL_VERSION LESS MKL_REQUIRED_VERSION)
-      message(FATAL_ERROR "MKL ${MKL_VERSION} is found but ${MKL_REQUIRED_VERSION} is required. Please download and install a more recent version of MKL from:"
-                          "\n    https://registrationcenter.intel.com/en/products/download/3178/\n")
-  endif()
+vcpkg_download_distfile(installer_path
+    URLS "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/${magic_number}/${filename}"
+    FILENAME "${filename}"
+    SHA512 "${sha}"
+)
+
+# Note: intel_thread and lp64 are the defaults.
+set(interface "ilp64") # or ilp64; ilp == 64 bit int api
+#https://www.intel.com/content/www/us/en/develop/documentation/onemkl-linux-developer-guide/top/linking-your-application-with-onemkl/linking-in-detail/linking-with-interface-libraries/using-the-ilp64-interface-vs-lp64-interface.html
+if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
+    set(threading "intel_thread") #sequential or intel_thread or tbb_thread or pgi_thread
+else()
+    set(threading "sequential")
+endif()
+if(threading STREQUAL "intel_thread")
+    set(short_thread "iomp")
+else()
+    string(SUBSTRING "${threading}" "0" "3" short_thread)
 endif()
+set(main_pc_file "mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc")
 
-if(sha)
-  vcpkg_download_distfile(archive_path
-      URLS "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/${magic_number}/${filename}"
-      FILENAME "${filename}"
-      SHA512 ${sha}
-  )
+# First extraction level: packages (from offline installer)
+set(extract_0_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-extract")
+file(REMOVE_RECURSE "${extract_0_dir}")
+file(MAKE_DIRECTORY "${extract_0_dir}")
 
-  file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}")
+# Second extraction level: actual files (from packages)
+set(extract_1_dir "${CURRENT_PACKAGES_DIR}/intel-extract")
+file(REMOVE_RECURSE "${extract_1_dir}")
+file(MAKE_DIRECTORY "${extract_1_dir}")
 
-  # Note: intel_thread and lp64 are the defaults.
-  set(interface "ilp64") # or ilp64; ilp == 64 bit int api
-  #https://www.intel.com/content/www/us/en/develop/documentation/onemkl-linux-developer-guide/top/linking-your-application-with-onemkl/linking-in-detail/linking-with-interface-libraries/using-the-ilp64-interface-vs-lp64-interface.html
-  if(VCPKG_CRT_LINKAGE STREQUAL "dynamic")
-      set(threading "intel_thread") #sequential or intel_thread or tbb_thread or pgi_thread
-  else()
-      set(threading "sequential")
-  endif()
-  if(threading STREQUAL "intel_thread")
-      set(short_thread "iomp")
-  else()
-      string(SUBSTRING "${threading}" "0" "3" short_thread)
-  endif()
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
 
-  if(VCPKG_TARGET_IS_WINDOWS)
+if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_find_acquire_program(7Z)
-    vcpkg_execute_in_download_mode(
-                            COMMAND "${7Z}" x "${archive_path}" "-o${CURRENT_PACKAGES_DIR}/intel-extract" "-y" "-bso0" "-bsp0"
-                            WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}"
-                        )
-                        
+    message(STATUS "Extracting offline installer")
+    vcpkg_execute_required_process(
+        COMMAND "${7Z}" x "${installer_path}" "-o${extract_0_dir}" "-y" "-bso0" "-bsp0"
+        WORKING_DIRECTORY "${extract_0_dir}"
+        LOGNAME "extract-${TARGET_TRIPLET}-0"
+    )
 
     set(packages 
         "intel.oneapi.win.mkl.devel,v=2023.0.0-25930/oneapi-mkl-devel-for-installer_p_2023.0.0.25930.msi" # has the required libs. 
@@ -92,186 +87,167 @@ if(sha)
         #"intel.oneapi.win.tbb.runtime,v=2021.8.0-25874" #TBB
         )
 
-    set(output_path "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}") # vcpkg.cmake adds everything in /tools to CMAKE_PROGRAM_PATH. That is not desired 
-    file(MAKE_DIRECTORY "${output_path}")
     foreach(pack IN LISTS packages)
-        set(archive_path "${CURRENT_PACKAGES_DIR}/intel-extract/packages/${pack}")
+        set(package_path "${extract_0_dir}/packages/${pack}")
         cmake_path(GET pack STEM LAST_ONLY packstem)
-        cmake_path(NATIVE_PATH archive_path archive_path_native)
-            vcpkg_execute_in_download_mode(
-                            COMMAND "${LESSMSI}" x "${archive_path_native}" # Using output_path here does not work in bash
-                            WORKING_DIRECTORY "${output_path}" 
-                            OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/lessmsi-${TARGET_TRIPLET}-out.log"
-                            ERROR_FILE "${CURRENT_BUILDTREES_DIR}/lessmsi-${TARGET_TRIPLET}-err.log"
-                            RESULT_VARIABLE error_code
-                        )
-        file(COPY "${output_path}/${packstem}/SourceDir/" DESTINATION "${output_path}")
-        file(REMOVE_RECURSE "${output_path}/${packstem}")
+        cmake_path(NATIVE_PATH package_path package_path_native)
+        vcpkg_execute_required_process(
+            COMMAND "${LESSMSI}" x "${package_path_native}"
+            WORKING_DIRECTORY "${extract_1_dir}" 
+            LOGNAME "extract-${TARGET_TRIPLET}-${packstem}"
+        )
+        file(COPY "${extract_1_dir}/${packstem}/SourceDir/" DESTINATION "${extract_1_dir}")
+        file(REMOVE_RECURSE "${extract_1_dir}/${packstem}")
     endforeach()
 
-    set(basepath "${output_path}/Intel/Compiler/12.0/mkl/2023.0.0/")
-    set(basepath2 "${output_path}/Intel/Compiler/12.0/compiler/2023.0.0/")
-    file(REMOVE_RECURSE "${output_path}/Intel/shared files"
-                        "${output_path}/Intel/Compiler/12.0/conda_channel"
-                        "${basepath}tools"
-                        "${basepath}interfaces"
-                        "${basepath}examples"
-                        "${basepath}bin"
-                        "${basepath}benchmarks"
-                        )
-
-    file(COPY "${basepath}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+    set(mkl_dir "${extract_1_dir}/Intel/Compiler/12.0/mkl/2023.0.0")
+    file(COPY "${mkl_dir}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
     # see https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl-link-line-advisor.html for linking
     if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
       set(files "mkl_core_dll.lib" "mkl_${threading}_dll.lib" "mkl_intel_${interface}_dll.lib" "mkl_blas95_${interface}.lib" "mkl_lapack95_${interface}.lib") # "mkl_rt.lib" single dynamic lib with dynamic dispatch
-      file(COPY "${basepath}redist/intel64/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") # Could probably be reduced instead of copying all
+      file(COPY "${mkl_dir}/redist/intel64/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") # Could probably be reduced instead of copying all
       if(NOT VCPKG_BUILD_TYPE)
-        file(COPY "${basepath}redist/intel64/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+        file(COPY "${mkl_dir}/redist/intel64/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
       endif()
     else()
       set(files "mkl_core.lib" "mkl_${threading}.lib" "mkl_intel_${interface}.lib" "mkl_blas95_${interface}.lib" "mkl_lapack95_${interface}.lib")
     endif()
-    foreach(file ${files})
-      file(COPY "${basepath}lib/intel64/${file}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") # instead of manual-link keep normal structure
+    foreach(file IN LISTS files)
+      file(COPY "${mkl_dir}/lib/intel64/${file}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64") # instead of manual-link keep normal structure
       if(NOT VCPKG_BUILD_TYPE)
-        file(COPY "${basepath}lib/intel64/${file}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/intel64")
+        file(COPY "${mkl_dir}/lib/intel64/${file}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/intel64")
       endif()
     endforeach()
+    file(COPY_FILE "${mkl_dir}/lib/pkgconfig/${main_pc_file}" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}")
 
-    configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" @ONLY)
-    if(NOT VCPKG_BUILD_TYPE)
-      configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" @ONLY)
-      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "/include" "/../include")
-    endif()
-
+    set(compiler_dir "${extract_1_dir}/Intel/Compiler/12.0/compiler/2023.0.0")
     if(threading STREQUAL "intel_thread")
-      file(COPY "${basepath2}windows/redist/intel64_win/compiler/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
-      file(COPY "${basepath2}windows/compiler/lib/intel64_win/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64")
-      configure_file("${basepath2}lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" @ONLY)
+      file(COPY "${compiler_dir}/windows/redist/intel64_win/compiler/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+      file(COPY "${compiler_dir}/windows/compiler/lib/intel64_win/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64")
+      file(COPY_FILE "${compiler_dir}/lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc")
       vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "/windows/compiler/lib/intel64_win/" "/lib/intel64/")
-      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "Cflags: -I \${includedir}" "")
+      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}" "openmp" "libiomp5")
       if(NOT VCPKG_BUILD_TYPE)
-          file(COPY "${basepath2}windows/redist/intel64_win/compiler/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
-          file(COPY "${basepath2}windows/compiler/lib/intel64_win/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/intel64")
-          configure_file("${basepath2}lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" @ONLY)
-          vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" "/windows/compiler/lib/intel64_win/" "/lib/intel64/")
-          vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" "Cflags: -I \${includedir}" "")
-      endif()
-      configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" @ONLY)
-      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" "openmp" "libiomp5")
-      if(NOT VCPKG_BUILD_TYPE)
-        configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" @ONLY)
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "openmp" "libiomp5")
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "/include" "/../include")
+        file(COPY "${compiler_dir}/windows/redist/intel64_win/compiler/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+        file(COPY "${compiler_dir}/windows/compiler/lib/intel64_win/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/intel64")
       endif()
     endif()
-
-
-    file(COPY "${basepath}lib/cmake/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "MKL_CMAKE_PATH}/../../../" "MKL_CMAKE_PATH}/../../")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "redist/\${MKL_ARCH}/" "bin")
-    #TODO: Hardcode settings from portfile in config.cmake
-    #TODO. Give lapack/blas information about the correct BLA_VENDOR depending on settings. 
-
-    file(INSTALL "${CURRENT_PACKAGES_DIR}/intel-extract/packages/intel.oneapi.win.mkl.product,v=2023.0.0-25930/licenses/license.htm" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-    file(INSTALL "${basepath}licensing" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-  elseif(VCPKG_TARGET_IS_LINUX)
-    message(WARNING "This port is still a work on progress on linux. E.g. it is not correctly filtering the libraries in accordance with VCPKG_LIBRARY_LINKAGE. Furthermore it is using the default threading which is Intel OpenMP which is known to segfault if GNU OpenMP is also used elsewhere!")
-    #./l_onemkl_p_2023.0.0.25398_offline.sh --extract-only -a -s
-    # cmake -E tar -xf <payload>
-    
-    set(output_path "${CURRENT_PACKAGES_DIR}/intel-extract")
-    message(STATUS "${archive_path}")
-    file(MAKE_DIRECTORY "${output_path}")
-    vcpkg_execute_in_download_mode(
-                            COMMAND "bash" "--verbose" "--noprofile" "${archive_path}" "--extract-only" "--extract-folder" "${output_path}"
-                            WORKING_DIRECTORY "${output_path}"
-                            OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/extract-${TARGET_TRIPLET}-out.log"
-                            ERROR_FILE "${CURRENT_BUILDTREES_DIR}/extract-${TARGET_TRIPLET}-err.log"
-                        )
-    set(packages 
-      "intel.oneapi.lin.mkl.devel,v=2023.0.0-25398" # has the required staic libs. 
-      "intel.oneapi.lin.mkl.runtime,v=2023.0.0-25398" # has the required dynamic so.
-      "intel.oneapi.lin.openmp,v=2023.0.0-25370" #OpenMP
+else()
+    message(STATUS "Warning: This port is still a work on progress. 
+   E.g. it is not correctly filtering the libraries in accordance with
+   VCPKG_LIBRARY_LINKAGE. It is using the default threading (Intel OpenMP)
+   which is known to segfault when used together with GNU OpenMP.
+")
+
+    message(STATUS "Extracting offline installer")
+    if(VCPKG_TARGET_IS_LINUX)
+      vcpkg_execute_required_process(
+          COMMAND "bash" "--verbose" "--noprofile" "${installer_path}" "--extract-only" "--extract-folder" "${extract_0_dir}"
+          WORKING_DIRECTORY "${extract_0_dir}"
+          LOGNAME "extract-${TARGET_TRIPLET}-0"
       )
+      file(RENAME "${extract_0_dir}/l_onemkl_p_2023.0.0.25398_offline/packages" "${extract_0_dir}/packages")
+    elseif(VCPKG_TARGET_IS_OSX)
+      find_program(HDIUTIL NAMES hdiutil REQUIRED)
+      file(MAKE_DIRECTORY "${extract_0_dir}/packages")
+      message(STATUS "... Don't interrupt.")
+      vcpkg_execute_required_process(
+          COMMAND "${CMAKE_COMMAND}" "-Ddmg_path=${installer_path}"
+                                     "-Doutput_dir=${extract_0_dir}/packages"
+                                     "-DHDIUTIL=${HDIUTIL}"
+                                     -P "${CMAKE_CURRENT_LIST_DIR}/copy-from-dmg.cmake"
+          WORKING_DIRECTORY "${extract_0_dir}"
+          LOGNAME "extract-${TARGET_TRIPLET}-0"
+      )
+      message(STATUS "... Done.")
+    endif()
 
-    foreach(pack IN LISTS packages)
-        set(archive_path "${output_path}/l_onemkl_p_2023.0.0.25398_offline/packages/${pack}")
-            vcpkg_execute_in_download_mode(
-                            COMMAND "${CMAKE_COMMAND}" "-E" "tar" "-xf" "${archive_path}/cupPayload.cup"
-                            WORKING_DIRECTORY "${output_path}"
-                            OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/mkl-extract-${TARGET_TRIPLET}-out.log"
-                            ERROR_FILE "${CURRENT_BUILDTREES_DIR}/mkl-extract-${TARGET_TRIPLET}-err.log"
-            )
-    endforeach()
-
-    set(basepath "${output_path}/_installdir/mkl/2023.0.0/")
-    set(basepath2 "${output_path}/_installdir/compiler/2023.0.0/")
-    file(REMOVE_RECURSE "${basepath}../../conda_channel/"
-                        "${basepath}tools"
-                        "${basepath}interfaces"
-                        "${basepath}examples"
-                        "${basepath}bin"
-                        "${basepath}benchmarks"
-                        "${basepath}env"
-                        "${basepath}modulefiles"
-                        )
-
-    file(COPY "${basepath}include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
-    file(COPY "${basepath}lib/intel64/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64")
-
+    file(GLOB package_path "${extract_0_dir}/packages/intel.oneapi.${package_infix}.mkl.runtime,v=2023.0.0-*")
+    cmake_path(GET package_path STEM LAST_ONLY packstem)
+    message(STATUS "Extracting ${packstem}")
+    vcpkg_execute_required_process(
+        COMMAND "${CMAKE_COMMAND}" "-E" "tar" "-xf" "${package_path}/cupPayload.cup"
+            "_installdir/mkl/2023.0.0/lib"
+            "_installdir/mkl/2023.0.0/licensing"
+        WORKING_DIRECTORY "${extract_1_dir}"
+        LOGNAME "extract-${TARGET_TRIPLET}-${packstem}"
+    )
+    file(GLOB package_path "${extract_0_dir}/packages/intel.oneapi.${package_infix}.mkl.devel,v=2023.0.0-*")
+    cmake_path(GET package_path STEM LAST_ONLY packstem)
+    message(STATUS "Extracting ${packstem}")
+    vcpkg_execute_required_process(
+        COMMAND "${CMAKE_COMMAND}" "-E" "tar" "-xf" "${package_path}/cupPayload.cup"
+            "_installdir/mkl/2023.0.0/bin"
+            "_installdir/mkl/2023.0.0/include"
+            "_installdir/mkl/2023.0.0/lib"
+        WORKING_DIRECTORY "${extract_1_dir}"
+        LOGNAME "extract-${TARGET_TRIPLET}-${packstem}"
+    )
+    file(GLOB package_path "${extract_0_dir}/packages/intel.oneapi.${package_infix}.openmp,v=2023.0.0-*")
+    cmake_path(GET package_path STEM LAST_ONLY packstem)
+    message(STATUS "Extracting ${packstem}")
+    vcpkg_execute_required_process(
+        COMMAND "${CMAKE_COMMAND}" "-E" "tar" "-xf" "${package_path}/cupPayload.cup"
+            "_installdir/compiler/2023.0.0"
+        WORKING_DIRECTORY "${extract_1_dir}"
+        LOGNAME "extract-${TARGET_TRIPLET}-${packstem}"
+    )
+
+    set(mkl_dir "${extract_1_dir}/_installdir/mkl/2023.0.0")
+    file(COPY "${mkl_dir}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+    file(COPY "${mkl_dir}/${package_libdir}/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64")
     if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
       set(to_remove_suffix .a)
+    elseif(VCPKG_TARGET_IS_OSX)
+      set(to_remove_suffix .dylib)
     else()
       set(to_remove_suffix .so)
     endif()
-    file(GLOB_RECURSE files_to_remove "${CURRENT_PACKAGES_DIR}/lib/intel64/*${to_remove_suffix}" "${CURRENT_PACKAGES_DIR}/lib/intel64/*${to_remove_suffix}.?")
+    file(GLOB_RECURSE files_to_remove
+        "${CURRENT_PACKAGES_DIR}/lib/intel64/*${to_remove_suffix}"
+        "${CURRENT_PACKAGES_DIR}/lib/intel64/*${to_remove_suffix}.?"
+    )
     file(REMOVE ${files_to_remove})
-    
-    configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" @ONLY)
-    if(NOT VCPKG_BUILD_TYPE)
-      configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" @ONLY)
-      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "/lib/intel64" "/../lib/intel64")
-      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "/include" "/../include")
+    file(COPY_FILE "${mkl_dir}/lib/pkgconfig/${main_pc_file}" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}" "\${exec_prefix}/${package_libdir}" "\${exec_prefix}/lib/intel64")
+  
+    set(compiler_dir "${extract_1_dir}/_installdir/compiler/2023.0.0")
+    if(threading STREQUAL "intel_thread")
+      file(COPY "${compiler_dir}/${compiler_libdir}/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64")
+      file(COPY_FILE "${compiler_dir}/lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc")
+      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "/${compiler_libdir}/" "/lib/intel64/")
+      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}" "openmp" "libiomp5")
     endif()
+endif()
 
-    if(threading STREQUAL "intel_thread")
-      file(COPY "${basepath2}linux/compiler/lib/intel64_lin/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/intel64")
-      configure_file("${basepath2}lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" @ONLY)
-      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "/linux/compiler/lib/intel64/" "/lib/intel64/")
-      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libiomp5.pc" "Cflags: -I \${includedir}" "")
-      if(NOT VCPKG_BUILD_TYPE)
-          configure_file("${basepath2}lib/pkgconfig/openmp.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" @ONLY)
-          vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" "/linux/compiler/lib/intel64/" "/../lib/intel64/")
-          vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libiomp5.pc" "Cflags: -I \${includedir}" "")
+file(COPY_FILE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${main_pc_file}" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc")
+if(NOT VCPKG_BUILD_TYPE)
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
+    file(GLOB pc_files RELATIVE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc")
+    foreach(file IN LISTS pc_files)
+      file(COPY_FILE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${file}" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${file}")
+      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${file}" "/include" "/../include")
+      if(NOT VCPKG_TARGET_IS_WINDOWS)
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${file}" "/lib/intel64" "/../lib/intel64")
       endif()
-      configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" @ONLY)
-      vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/mkl.pc" "openmp" "libiomp5")
-      if(NOT VCPKG_BUILD_TYPE)
-        configure_file("${basepath}lib/pkgconfig/mkl-${VCPKG_LIBRARY_LINKAGE}-${interface}-${short_thread}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" @ONLY)
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "openmp" "libiomp5")
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/mkl.pc" "/include" "/../include")
-      endif()
-    endif()
+    endforeach()
+endif()
 
-    file(COPY "${basepath}lib/cmake/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "MKL_CMAKE_PATH}/../../../" "MKL_CMAKE_PATH}/../../")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "redist/\${MKL_ARCH}/" "bin")
-    #TODO: Hardcode settings from portfile in config.cmake
+file(COPY "${mkl_dir}/lib/cmake/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "MKL_CMAKE_PATH}/../../../" "MKL_CMAKE_PATH}/../../")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "redist/\${MKL_ARCH}/" "bin")
+#TODO: Hardcode settings from portfile in config.cmake
+#TODO: Give lapack/blas information about the correct BLA_VENDOR depending on settings. 
 
-    file(INSTALL "${basepath}licensing/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-    file(INSTALL "${basepath}licensing" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-  endif()
+file(INSTALL "${mkl_dir}/licensing" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(GLOB package_path "${extract_0_dir}/packages/intel.oneapi.${package_infix}.mkl.product,v=2023.0.0-*")
+vcpkg_install_copyright(FILE_LIST "${package_path}/licenses/license.htm")
 
-  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/intel-extract"
-                      "${CURRENT_PACKAGES_DIR}/manual-tools"
-                      )
-endif()
+file(REMOVE_RECURSE
+    "${extract_0_dir}"
+    "${extract_1_dir}"
+    "${CURRENT_PACKAGES_DIR}/lib/intel64/cmake"
+    "${CURRENT_PACKAGES_DIR}/lib/intel64/pkgconfig"
+)
 
-if(NOT sha)
-    configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-port-config.cmake" @ONLY)
-    configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/mkl/vcpkg-cmake-wrapper.cmake" @ONLY)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" "bin\${MKL_DLL_GLOB" "bin/\${MKL_DLL_GLOB")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mkl/MKLConfig.cmake" [["../bincompiler" "../compiler/lib"]] [["bin" "../bincompiler" "../compiler/lib"]])
-    file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-endif()
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/ports/intel-mkl/vcpkg-cmake-wrapper.cmake b/ports/intel-mkl/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index 76592b33d3804a..00000000000000
--- a/ports/intel-mkl/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-set(MKL_THREADING "@threading@")
-if("@VCPKG_TARGET_ARCHITECTURE@" STREQUAL "x64")
-    set(MKL_INTERFACE "@interface@")
-endif()
-
-_find_package(${ARGS})
\ No newline at end of file
diff --git a/ports/intel-mkl/vcpkg-port-config.cmake b/ports/intel-mkl/vcpkg-port-config.cmake
deleted file mode 100644
index 09954ce075e36e..00000000000000
--- a/ports/intel-mkl/vcpkg-port-config.cmake
+++ /dev/null
@@ -1 +0,0 @@
-set(ENV{MKLROOT} "${CURRENT_INSTALLED_DIR}")
\ No newline at end of file
diff --git a/ports/intel-mkl/vcpkg.json b/ports/intel-mkl/vcpkg.json
index 59f36f41807eb6..0773404897ae4b 100644
--- a/ports/intel-mkl/vcpkg.json
+++ b/ports/intel-mkl/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "intel-mkl",
   "version": "2023.0.0",
+  "port-version": 1,
   "description": "Intel® Math Kernel Library (Intel® MKL) accelerates math processing routines, increases application performance, and reduces development time on Intel® processors.",
   "homepage": "https://www.intel.com/content/www/us/en/developer/tools/oneapi/onemkl.html",
   "license": null,
-  "supports": "(windows | linux) & x64",
+  "supports": "(windows | linux | osx) & x64",
   "dependencies": [
     {
       "name": "vcpkg-tool-lessmsi",
diff --git a/versions/baseline.json b/versions/baseline.json
index 133bc8eebfa28b..428321312fd582 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3282,7 +3282,7 @@
     },
     "intel-mkl": {
       "baseline": "2023.0.0",
-      "port-version": 0
+      "port-version": 1
     },
     "intelrdfpmathlib": {
       "baseline": "20U2",
diff --git a/versions/i-/intel-mkl.json b/versions/i-/intel-mkl.json
index c0d958ef49c6f7..6b71917ac97597 100644
--- a/versions/i-/intel-mkl.json
+++ b/versions/i-/intel-mkl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "285fa0de9d6f05022ce06e53f7c8c21048ff586f",
+      "version": "2023.0.0",
+      "port-version": 1
+    },
     {
       "git-tree": "e5a15d03509e3eaf676a2e3ec935acff7fbb9285",
       "version": "2023.0.0",