diff --git a/CHANGES b/CHANGES
index cd4742e2e95..bf9864bb53d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -27,6 +27,8 @@ Upcoming release: BINARY COMPATIBLE
 ## Changes
 
 * Rename libsel4 config option ENABLE_SMP_SUPPORT to CONFIG_ENABLE_SMP_SUPPORT to be namespace compliant.
+* Rename libsel4 config option AARCH64_VSPACE_S2_START_L1 to CONFIG_AARCH64_VSPACE_S2_START_L1 to be namespace
+  compliant.
 
 ## Upgrade Notes
 ---
diff --git a/include/config.h b/include/config.h
index a1bdb73a91c..d3418b8ad0a 100644
--- a/include/config.h
+++ b/include/config.h
@@ -12,3 +12,9 @@
 #ifdef CONFIG_ENABLE_SMP_SUPPORT
 #define ENABLE_SMP_SUPPORT
 #endif
+
+#ifdef CONFIG_ARM_HYPERVISOR_SUPPORT
+#ifdef CONFIG_ARM_PA_SIZE_BITS_40
+#define AARCH64_VSPACE_S2_START_L1
+#endif
+#endif
diff --git a/libsel4/include/sel4/config.h b/libsel4/include/sel4/config.h
index 59c86a9cddf..8a705ae1187 100644
--- a/libsel4/include/sel4/config.h
+++ b/libsel4/include/sel4/config.h
@@ -10,12 +10,6 @@
 
 #include <autoconf.h>
 
-#ifdef CONFIG_ARM_HYPERVISOR_SUPPORT
-#ifdef CONFIG_ARM_PA_SIZE_BITS_40
-#define AARCH64_VSPACE_S2_START_L1
-#endif
-#endif
-
 /* Configurations requring the kernel log buffer */
 #if defined CONFIG_BENCHMARK_TRACK_KERNEL_ENTRIES || \
     defined CONFIG_BENCHMARK_TRACEPOINTS
diff --git a/src/arch/arm/config.cmake b/src/arch/arm/config.cmake
index e9eae955621..33d45709de9 100644
--- a/src/arch/arm/config.cmake
+++ b/src/arch/arm/config.cmake
@@ -96,6 +96,12 @@ config_option(
         "KernelArmCortexA15 OR KernelArmCortexA35 OR KernelArmCortexA57 OR KernelArmCortexA53 OR KernelArmCortexA72"
 )
 
+if(KernelArmPASizeBits40 AND ARM_HYPERVISOR_SUPPORT)
+    config_set(KernelAarch64VspaceS2StartL1 AARCH64_VSPACE_S2_START_L1 "ON")
+else()
+    config_set(KernelAarch64VspaceS2StartL1 AARCH64_VSPACE_S2_START_L1 "OFF")
+endif()
+
 config_option(
     KernelArmHypEnableVCPUCP14SaveAndRestore ARM_HYP_ENABLE_VCPU_CP14_SAVE_AND_RESTORE
     "Trap, but don't save/restore VCPUs' CP14 accesses \