diff --git a/ntoskrnl/config/cmcontrl.c b/ntoskrnl/config/cmcontrl.c
index 81d8086cb10..54d49499793 100644
--- a/ntoskrnl/config/cmcontrl.c
+++ b/ntoskrnl/config/cmcontrl.c
@@ -262,3 +262,11 @@ CmGetSystemControlValues(IN PVOID SystemHiveData,
     PsDefaultThreadLocaleId = PsDefaultSystemLocaleId;
     PsDefaultUILanguageId = PsInstallUILanguageId;
 }
+
+NTSTATUS
+NTAPI
+CmpSaveBootControlSet(IN USHORT ControlSet)
+{
+    DPRINT1("CmpSaveBootControlSet(%lu)\n", ControlSet);
+    return STATUS_SUCCESS;
+}
diff --git a/ntoskrnl/config/ntapi.c b/ntoskrnl/config/ntapi.c
index f3137ce861f..824992fe75f 100644
--- a/ntoskrnl/config/ntapi.c
+++ b/ntoskrnl/config/ntapi.c
@@ -1322,8 +1322,8 @@ NtInitializeRegistry(IN USHORT Flag)
         Flag -= CM_BOOT_FLAG_ACCEPTED;
         if (Flag)
         {
-            /* FIXME: Save the last known good boot */
-            //Status = CmpSaveBootControlSet(Flag);
+            /* Save the last known good boot */
+            Status = CmpSaveBootControlSet(Flag);
 
             /* Notify HAL */
             HalEndOfBoot();
diff --git a/ntoskrnl/include/internal/cm.h b/ntoskrnl/include/internal/cm.h
index c2900b2314b..76fc5b9d1a4 100644
--- a/ntoskrnl/include/internal/cm.h
+++ b/ntoskrnl/include/internal/cm.h
@@ -1177,6 +1177,12 @@ CmGetSystemControlValues(
     IN PCM_SYSTEM_CONTROL_VECTOR ControlVector
 );
 
+NTSTATUS
+NTAPI
+CmpSaveBootControlSet(
+    IN USHORT ControlSet
+);
+
 //
 // Hardware Configuration Routines
 //