diff --git a/var/spack/repos/builtin/packages/papi/intel-freeform.patch b/var/spack/repos/builtin/packages/papi/intel-cray-freeform.patch
similarity index 85%
rename from var/spack/repos/builtin/packages/papi/intel-freeform.patch
rename to var/spack/repos/builtin/packages/papi/intel-cray-freeform.patch
index 29e5a82828a..518c2e3d3c6 100644
--- a/var/spack/repos/builtin/packages/papi/intel-freeform.patch
+++ b/var/spack/repos/builtin/packages/papi/intel-cray-freeform.patch
@@ -1,12 +1,13 @@
 diff -Naur papi-7.0.1-orig/src/components/sde/tests/Makefile papi-7.0.1/src/components/sde/tests/Makefile
 --- papi-7.0.1-orig/src/components/sde/tests/Makefile	2023-06-19 14:27:44.224943877 -0400
 +++ papi-7.0.1/src/components/sde/tests/Makefile	2023-06-19 16:25:16.749303194 -0400
-@@ -1,12 +1,16 @@
+@@ -1,12 +1,17 @@
  NAME=sde
  include ../../Makefile_comp_tests.target
  INCLUDE += -I$(datadir)/sde_lib -I..
 +
 +intel_compilers := ifort ifx
++cray_compilers := ftn crayftn
  ifeq ($(notdir $(F77)),gfortran)
  	FFLAGS +=-ffree-form -ffree-line-length-none
  else ifeq ($(notdir $(F77)),flang)
@@ -14,7 +15,7 @@ diff -Naur papi-7.0.1-orig/src/components/sde/tests/Makefile papi-7.0.1/src/comp
 -else
 +else ifneq ($(findstring $(notdir $(F77)),$(intel_compilers)),)
  	FFLAGS +=-free
-+else ifeq ($(notdir $(F77)),crayftn)
++else ifneq ($(findstring $(notdir $(F77)),$(cray_compilers)),)
 +	FFLAGS +=-ffree
  endif
  FFLAGS +=-g
@@ -22,11 +23,12 @@ diff -Naur papi-7.0.1-orig/src/components/sde/tests/Makefile papi-7.0.1/src/comp
 diff -Naur papi-7.0.1-orig/src/components/sysdetect/tests/Makefile papi-7.0.1/src/components/sysdetect/tests/Makefile
 --- papi-7.0.1-orig/src/components/sysdetect/tests/Makefile	2023-06-19 14:27:44.220943888 -0400
 +++ papi-7.0.1/src/components/sysdetect/tests/Makefile	2023-06-19 16:25:43.213238526 -0400
-@@ -19,12 +19,15 @@
+@@ -19,12 +19,16 @@
      FTESTS =
  endif
  
 +intel_compilers := ifort ifx
++cray_compilers := ftn crayftn
  ifeq ($(notdir $(F77)),gfortran)
      FFLAGS +=-ffree-form -ffree-line-length-none
  else ifeq ($(notdir $(F77)),flang)
@@ -34,7 +36,7 @@ diff -Naur papi-7.0.1-orig/src/components/sysdetect/tests/Makefile papi-7.0.1/sr
 -else
 +else ifneq ($(findstring $(notdir $(F77)),$(intel_compilers)),)
      FFLAGS +=-free
-+else ifeq ($(notdir $(F77)),crayftn)
++else ifneq ($(findstring $(notdir $(F77)),$(cray_compilers)),)
 +    FFLAGS +=-ffree
  endif