diff --git a/.github/compat/compat.csv b/.github/compat/compat.csv
index 62c9e3dd..f40d018b 100644
--- a/.github/compat/compat.csv
+++ b/.github/compat/compat.csv
@@ -1,11 +1,11 @@
-compiler,gcc,gcc,gcc,gcc,gcc,gcc,gcc,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc
-version,10,11,12,13,7,8,9,2021.1,2021.10,2021.2,2021.3,2021.4,2021.5,2021.6,2021.7.1,2021.7,2021.8,2021.9,2021.1.2,2021.1.2,2021.1,2021.2,2021.4,2022.0,2022.1,2022.2.1,2022.2,2023.0,2023.1,2023.2,20.11,21.11,22.11,23.11,23.3,23.5,23.7,23.9
-runner,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-macos-11,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,
-macos-12,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,
-macos-13,✓,✓,✓,✓,,,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,
-macos-14,,✓,✓,✓,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-ubuntu-20.04,✓,✓,,✓,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓
-ubuntu-22.04,✓,✓,✓,✓,,,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓
-windows-2019,✓,✓,✓,✓,,✓,✓,,✓,,,,,✓,,✓,✓,✓,,,,,,,✓,,✓,✓,✓,✓,,,,,,,,
-windows-2022,✓,✓,✓,✓,,✓,✓,,✓,,,,,✓,,✓,✓,✓,,,,,,,✓,,✓,✓,✓,✓,,,,,,,,
+compiler,gcc,gcc,gcc,gcc,gcc,gcc,gcc,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc
+version,10,11,12,13,7,8,9,2021.1,2021.10,2021.2,2021.3,2021.4,2021.5,2021.6,2021.7.1,2021.7,2021.8,2021.9,2021.1.2,2021.1.2,2021.1,2021.2,2021.4,2022.0,2022.1,2022.2.1,2022.2,2023.0,2023.1,2023.2,2024.0,20.11,21.11,22.11,23.11,23.3,23.5,23.7,23.9
+runner,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+macos-11,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,,
+macos-12,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,,
+macos-13,✓,✓,✓,✓,,,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,,
+macos-14,,✓,✓,✓,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+ubuntu-20.04,✓,✓,,✓,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓
+ubuntu-22.04,✓,✓,✓,✓,,,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓
+windows-2019,✓,✓,✓,✓,,✓,✓,,✓,,,,,✓,,✓,✓,✓,,,,,,,✓,,✓,✓,✓,✓,✓,,,,,,,,
+windows-2022,✓,✓,✓,✓,,✓,✓,,✓,,,,,✓,,✓,✓,✓,,,,,,,✓,,✓,✓,✓,✓,✓,,,,,,,,
diff --git a/.github/compat/long_compat.csv b/.github/compat/long_compat.csv
index 38dcbac9..652e5b44 100644
--- a/.github/compat/long_compat.csv
+++ b/.github/compat/long_compat.csv
@@ -93,6 +93,7 @@ ubuntu-20.04,intel,2022.2,✓
 ubuntu-20.04,intel,2023.0,✓
 ubuntu-20.04,intel,2023.1,✓
 ubuntu-20.04,intel,2023.2,✓
+ubuntu-20.04,intel,2024.0,✓
 ubuntu-20.04,nvidia-hpc,20.11,✓
 ubuntu-20.04,nvidia-hpc,20.7,
 ubuntu-20.04,nvidia-hpc,20.9,
@@ -136,6 +137,7 @@ ubuntu-22.04,intel,2022.2,✓
 ubuntu-22.04,intel,2023.0,✓
 ubuntu-22.04,intel,2023.1,✓
 ubuntu-22.04,intel,2023.2,✓
+ubuntu-22.04,intel,2024.0,✓
 ubuntu-22.04,nvidia-hpc,20.11,✓
 ubuntu-22.04,nvidia-hpc,20.7,
 ubuntu-22.04,nvidia-hpc,20.9,
@@ -179,6 +181,7 @@ windows-2019,intel,2022.2,✓
 windows-2019,intel,2023.0,✓
 windows-2019,intel,2023.1,✓
 windows-2019,intel,2023.2,✓
+windows-2019,intel,2024.0,✓
 windows-2022,gcc,10,✓
 windows-2022,gcc,11,✓
 windows-2022,gcc,12,✓
@@ -210,3 +213,4 @@ windows-2022,intel,2022.2,✓
 windows-2022,intel,2023.0,✓
 windows-2022,intel,2023.1,✓
 windows-2022,intel,2023.2,✓
+windows-2022,intel,2024.0,✓
diff --git a/.github/compat/matrix.yml b/.github/compat/matrix.yml
index 6c6dcdfd..c8a8ea89 100644
--- a/.github/compat/matrix.yml
+++ b/.github/compat/matrix.yml
@@ -14,6 +14,7 @@ toolchain:
   - {compiler: gcc, version:  9}
   - {compiler: gcc, version:  8}
   - {compiler: gcc, version:  7}
+  - {compiler: intel, version: '2024.0'}
   - {compiler: intel, version: '2023.2'}
   - {compiler: intel, version: '2023.1'}
   - {compiler: intel, version: '2023.0'}
diff --git a/install-intel-windows.bat b/install-intel-windows.bat
index ba62671f..8b85ddbc 100644
--- a/install-intel-windows.bat
+++ b/install-intel-windows.bat
@@ -6,4 +6,4 @@ start /b /wait %TEMP%\webimage.exe -s -x -f %TEMP%\webimage_extracted --log %TEM
 del %TEMP%\webimage.exe
 
 :: run installer
-%TEMP%\webimage_extracted\bootstrapper.exe -s --action install --components=intel.oneapi.win.cpp-compiler:intel.oneapi.win.ifort-compiler --eula=accept -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=%TEMP%
+%TEMP%\webimage_extracted\bootstrapper.exe -s --action install --components=%2 --eula=accept -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=%TEMP%
diff --git a/setup-fortran.sh b/setup-fortran.sh
index ec436dbd..04c41ee9 100755
--- a/setup-fortran.sh
+++ b/setup-fortran.sh
@@ -227,6 +227,10 @@ intel_version_map_l()
     esac
   else
     case $actual_version in
+      # 2024 versions omit patch version number in pkg name
+      2024.0*)
+        version=2024.0
+        ;;
       2022.0.0 | 2022.0)
         version=2022.0.2
         ;;
@@ -304,6 +308,9 @@ intel_version_map_w()
     esac
   else
     case $actual_version in
+      2024 | 2024.0 | 2024.0.1)
+        version=2024.0.1
+        ;;
       2023.2 | 2023.1 | 2023.0)
         version=$actual_version.0
         ;;
@@ -335,8 +342,17 @@ install_intel_apt()
     | sudo tee /etc/apt/sources.list.d/oneAPI.list
   sudo apt-get update
 
-  sudo apt-get install \
-    intel-oneapi-compiler-{fortran,dpcpp-cpp-and-cpp-classic}-$version
+  # c/cpp compiler package names changed with 2024+
+  case $version in
+    2024*)
+      sudo apt-get install \
+        intel-oneapi-compiler-{fortran,dpcpp-cpp}-$version
+      ;;
+    *)
+      sudo apt-get install \
+        intel-oneapi-compiler-{fortran,dpcpp-cpp-and-cpp-classic}-$version
+      ;;
+  esac
 
   source /opt/intel/oneapi/setvars.sh
   export_intel_vars
@@ -419,49 +435,40 @@ install_intel_win()
   intel_version_map_w $version $classic
 
   case $version in
+    2024.0.1)
+      WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/IRC_NAS/7a6db8a1-a8b9-4043-8e8e-ca54b56c34e4/w_HPCKit_p_2024.0.1.35_offline.exe
+      WINDOWS_HPCKIT_COMPONENTS=intel.oneapi.win.ifort-compiler:intel.oneapi.win.cpp-dpcpp-common
+      ;;
     2023.2.0)
       WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/IRC_NAS/438527fc-7140-422c-a851-389f2791816b/w_HPCKit_p_2023.2.0.49441_offline.exe
+      WINDOWS_HPCKIT_COMPONENTS=intel.oneapi.win.ifort-compiler:intel.oneapi.win.cpp-compiler
       ;;
     2023.1.0)
       WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/IRC_NAS/2a13d966-fcc5-4a66-9fcc-50603820e0c9/w_HPCKit_p_2023.1.0.46357_offline.exe
+      WINDOWS_HPCKIT_COMPONENTS=intel.oneapi.win.ifort-compiler:intel.oneapi.win.cpp-compiler
       ;;
     2023.0.0)
       WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/irc_nas/19085/w_HPCKit_p_2023.0.0.25931_offline.exe
+      WINDOWS_HPCKIT_COMPONENTS=intel.oneapi.win.ifort-compiler:intel.oneapi.win.cpp-compiler
       ;;
     2022.3.1)
       WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/irc_nas/18976/w_HPCKit_p_2022.3.1.19755_offline.exe
+      WINDOWS_HPCKIT_COMPONENTS=intel.oneapi.win.ifort-compiler:intel.oneapi.win.cpp-compiler
       ;;
     2022.3.0)
       WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/irc_nas/18857/w_HPCKit_p_2022.3.0.9564_offline.exe
+      WINDOWS_HPCKIT_COMPONENTS=intel.oneapi.win.ifort-compiler:intel.oneapi.win.cpp-compiler
       ;;
     2022.2.0)
       WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/IRC_NAS/18680/w_HPCKit_p_2022.2.0.173_offline.exe
+      WINDOWS_HPCKIT_COMPONENTS=intel.oneapi.win.ifort-compiler:intel.oneapi.win.cpp-compiler
       ;;
-    # the installer versions below fail
-    # 2022.1.2)
-    #   WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/irc_nas/18529/w_HPCKit_p_2022.1.2.116_offline.exe
-    #   ;;
-    # 2022.1.0)
-    #   WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/irc_nas/18417/w_HPCKit_p_2022.1.0.93_offline.exe
-    #   ;;
-    # 2021.4.0)
-    #   WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/irc_nas/18247/w_HPCKit_p_2021.4.0.3340_offline.exe
-    #   ;;
-    # 2021.3.0)
-    #   WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/irc_nas/17940/w_HPCKit_p_2021.3.0.3227_offline.exe
-    #   ;;
-    # 2021.2.0)
-    #   WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/irc_nas/17762/w_HPCKit_p_2021.2.0.2901_offline.exe
-    #   ;;
-    # 2021.1.0)
-    #   WINDOWS_HPCKIT_URL=https://registrationcenter-download.intel.com/akdlm/irc_nas/17392/w_HPCKit_p_2021.1.0.2682_offline.exe
-    #   ;;
     *)
       exit 1
       ;;
   esac
 
-  "$GITHUB_ACTION_PATH/install-intel-windows.bat" $WINDOWS_HPCKIT_URL
+  "$GITHUB_ACTION_PATH/install-intel-windows.bat" $WINDOWS_HPCKIT_URL $WINDOWS_HPCKIT_COMPONENTS
 
   # don't call export_intel_vars here because the install may have
   # been restored from cache. export variables in action.yml after