diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2dd705a66fd..709f7ed26ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,7 +87,7 @@ if(MSVC OR WIN32 OR CYGWIN OR APPLE)
 else()
     option(GINKGO_BUILD_HWLOC "Build Ginkgo with HWLOC. Default is ON. If a system HWLOC is not found, then we try to build it ourselves. Switch this OFF to disable HWLOC." ON)
 endif()
-option(GINKGO_BUILD_PAPI_SDE "Build Ginkgo with PAPI SDE. Default is OFF." OFF)
+option(GINKGO_WITH_PAPI_SDE "Build Ginkgo with PAPI SDE. Default is OFF." OFF)
 option(GINKGO_DPCPP_SINGLE_MODE "Do not compile double kernels for the DPC++ backend." OFF)
 option(GINKGO_INSTALL_RPATH "Set the RPATH when installing its libraries." ON)
 option(GINKGO_INSTALL_RPATH_ORIGIN "Add $ORIGIN (Linux) or @loader_path (MacOS) to the installation RPATH." ON)
@@ -233,7 +233,7 @@ else()
     set(GINKGO_HAVE_HWLOC 0)
     message(STATUS "HWLOC is being forcibly switched off")
 endif()
-if(GINKGO_BUILD_PAPI_SDE)
+if(GINKGO_WITH_PAPI_SDE)
     set(GINKGO_HAVE_PAPI_SDE 1)
 else()
     set(GINKGO_HAVE_PAPI_SDE 0)
@@ -279,9 +279,9 @@ endif()
 if(GINKGO_BUILD_HWLOC)
     find_package(HWLOC 2.1) # No need for QUIET as we ship FindHWLOC
 endif()
-if(GINKGO_BUILD_PAPI_SDE)
+if(GINKGO_WITH_PAPI_SDE)
     # No need for QUIET as we ship FindPAPI
-    find_package(PAPI OPTIONAL_COMPONENTS sde)
+    find_package(PAPI 7.0.2 OPTIONAL_COMPONENTS sde)
 endif()
 add_subdirectory(third_party)    # Third-party tools and libraries
 
diff --git a/cmake/get_info.cmake b/cmake/get_info.cmake
index 2dd068abb50..e0227026968 100644
--- a/cmake/get_info.cmake
+++ b/cmake/get_info.cmake
@@ -190,8 +190,8 @@ ginkgo_print_module_footer(${detailed_log} "")
 
 ginkgo_print_generic_header(${minimal_log} "  Components:")
 ginkgo_print_generic_header(${detailed_log} "  Components:")
-ginkgo_print_variable(${minimal_log} "GINKGO_BUILD_PAPI_SDE")
-ginkgo_print_variable(${detailed_log} "GINKGO_BUILD_PAPI_SDE")
+ginkgo_print_variable(${minimal_log} "GINKGO_WITH_PAPI_SDE")
+ginkgo_print_variable(${detailed_log} "GINKGO_WITH_PAPI_SDE")
 if(TARGET PAPI::PAPI)
     ginkgo_print_variable(${detailed_log} "PAPI_VERSION")
     ginkgo_print_variable(${detailed_log} "PAPI_INCLUDE_DIR")
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index be35785d730..062f520b8e8 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -7,7 +7,7 @@ if(GINKGO_BUILD_HWLOC AND (NOT HWLOC_FOUND))
     add_subdirectory(hwloc)
 endif()
 
-if(GINKGO_BUILD_PAPI_SDE AND (NOT PAPI_FOUND))
+if(GINKGO_WITH_PAPI_SDE AND (NOT PAPI_FOUND))
     add_subdirectory(papi_sde)
 endif()
 
diff --git a/third_party/papi_sde/CMakeLists.txt b/third_party/papi_sde/CMakeLists.txt
index 4b58e368662..5b300d973a5 100644
--- a/third_party/papi_sde/CMakeLists.txt
+++ b/third_party/papi_sde/CMakeLists.txt
@@ -1,9 +1,9 @@
 message(STATUS "Configuring and building PAPI-SDE")
 set(TPL_PAPI_PATH "${PROJECT_BINARY_DIR}/third_party/papi_sde/src")
 ginkgo_load_and_configure_package(papi_external
-    "https://bitbucket.org/terry_cojean/papi/get/77cdd0ba8db98d86c1459dd5f55013aba242d5d5.tar.gz"
-    "SHA1=540c18a14eeafb83cd60cbbf0a96706111dbff3b"
-    "${TPL_PAPI_PATH}/src"
+    "https://github.com/icl-utk-edu/papi/archive/d2dd17a07a3c175fbb26ce5528671e3a7e00b80f.tar.gz"
+    "SHA1=55019037c47aff216ff831b4191e7147f6932464"
+    "${TPL_PAPI_PATH}/build"
     "./configure" "--prefix=${TPL_PAPI_PATH}/install"
         "--with-components=sde" "--with-libsde=yes" "--with-tests=no"
         "--with-static-lib=no" "--with-shared-lib=yes"