diff --git a/reactos/base/system/bootok/bootok.c b/reactos/base/system/bootok/bootok.c
new file mode 100644
index 00000000000..f9aec2c9fe3
--- /dev/null
+++ b/reactos/base/system/bootok/bootok.c
@@ -0,0 +1,31 @@
+/*
+ * PROJECT:         ReactOS Kernel
+ * LICENSE:         GPL - See COPYING in the top level directory
+ * FILE:            base/system/bootok/bootok.c
+ * PURPOSE:         Boot Acceptance Application
+ * PROGRAMMERS:     Eric Kohl
+ */
+
+/* INCLUDES *****************************************************************/
+
+#include <stdio.h>
+#include <tchar.h>
+#define WIN32_NO_STATUS
+#include <windows.h>
+
+/* FUNCTIONS ****************************************************************/
+
+int
+_tmain(int argc, TCHAR *argv[])
+{
+    UNREFERENCED_PARAMETER(argc);
+    UNREFERENCED_PARAMETER(argv);
+
+    if (!NotifyBootConfigStatus(TRUE))
+    {
+        _tprintf(_T("NotifyBootConfigStatus failed! (Error: %lu)\n"),
+                 GetLastError());
+    }
+
+    return 0;
+}
diff --git a/reactos/base/system/bootok/bootok.rbuild b/reactos/base/system/bootok/bootok.rbuild
new file mode 100644
index 00000000000..317b31d6112
--- /dev/null
+++ b/reactos/base/system/bootok/bootok.rbuild
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="bootok" type="win32cui" installbase="system32" installname="bootok.exe" unicode="yes">
+	<include base="bootok">.</include>
+	<define name="WINVER">0x600</define>
+	<define name="_WIN32_IE">0x0500</define>
+	<define name="_WIN32_WINNT">0x0600</define>
+	<library>kernel32</library>
+	<library>advapi32</library>
+	<file>bootok.c</file>
+	<file>bootok.rc</file>
+</module>
diff --git a/reactos/base/system/bootok/bootok.rc b/reactos/base/system/bootok/bootok.rc
new file mode 100644
index 00000000000..c86155f6bc9
--- /dev/null
+++ b/reactos/base/system/bootok/bootok.rc
@@ -0,0 +1,4 @@
+#define REACTOS_STR_FILE_DESCRIPTION	"Boot Acceptance Application for Registry\0"
+#define REACTOS_STR_INTERNAL_NAME	"bootok\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"bootok.exe\0"
+#include <reactos/version.rc>
diff --git a/reactos/base/system/system.rbuild b/reactos/base/system/system.rbuild
index c70e061d76c..61a76f48c95 100644
--- a/reactos/base/system/system.rbuild
+++ b/reactos/base/system/system.rbuild
@@ -4,6 +4,9 @@
 	<directory name="autochk">
 		<xi:include href="autochk/autochk.rbuild" />
 	</directory>
+	<directory name="bootok">
+		<xi:include href="bootok/bootok.rbuild" />
+	</directory>
 	<directory name="expand">
 		<xi:include href="expand/expand.rbuild" />
 	</directory>
diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index f312f8aedee..a82a425db55 100644
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -92,6 +92,7 @@ base\shell\explorer\notifyhook\notifyhook.dll       1
 base\shell\explorer-new\explorer_new.exe            4   optional
 
 base\system\autochk\autochk.exe                     1
+base\system\bootok\bootok.exe                       1
 base\system\format\format.exe                       1
 base\system\lsass\lsass.exe                         1
 base\system\msiexec\msiexec.exe                     1