diff --git a/CHANGES b/CHANGES
index 40b4a1e7b..452b0df1d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -28,6 +28,7 @@ Upcoming release: BINARY COMPATIBLE
 
  * Added support for the ARM Cortex A55
  * Added support for the ODroid C4
+ * Rename libsel4 config option ENABLE_SMP_SUPPORT to CONFIG_ENABLE_SMP_SUPPORT to be namespace compliant.
 
 ## Upgrade Notes
 ---
diff --git a/config.cmake b/config.cmake
index 383698329..647f314d4 100644
--- a/config.cmake
+++ b/config.cmake
@@ -274,6 +274,13 @@ config_string(
     UNQUOTE
 )
 
+# Set CONFIG_ENABLE_SMP_SUPPORT as an alias of CONFIG_MAX_NUM_NODES > 1
+if(KernelMaxNumNodes GREATER 1)
+    config_set(KernelEnableSMPSupport ENABLE_SMP_SUPPORT ON)
+else()
+    config_set(KernelEnableSMPSupport ENABLE_SMP_SUPPORT OFF)
+endif()
+
 config_string(
     KernelStackBits KERNEL_STACK_BITS
     "This describes the log2 size of the kernel stack. Great care should be taken as\
diff --git a/include/config.h b/include/config.h
index 30d913598..a1bdb73a9 100644
--- a/include/config.h
+++ b/include/config.h
@@ -7,3 +7,8 @@
 #pragma once
 
 #include <sel4/config.h>
+
+/* Set ENABLE_SMP_SUPPORT for kernel source files */
+#ifdef CONFIG_ENABLE_SMP_SUPPORT
+#define ENABLE_SMP_SUPPORT
+#endif
diff --git a/libsel4/include/sel4/config.h b/libsel4/include/sel4/config.h
index fe97bc5eb..59c86a9cd 100644
--- a/libsel4/include/sel4/config.h
+++ b/libsel4/include/sel4/config.h
@@ -10,11 +10,6 @@
 
 #include <autoconf.h>
 
-/* Alias CONFIG_MAX_NUM_NODES > 1 to ENABLE_SMP_SUPPORT */
-#if CONFIG_MAX_NUM_NODES > 1
-#define ENABLE_SMP_SUPPORT
-#endif
-
 #ifdef CONFIG_ARM_HYPERVISOR_SUPPORT
 #ifdef CONFIG_ARM_PA_SIZE_BITS_40
 #define AARCH64_VSPACE_S2_START_L1