diff --git a/User/Library/UserBootServices.c b/User/Library/UserBootServices.c
index e0cfd841..2e162a39 100644
--- a/User/Library/UserBootServices.c
+++ b/User/Library/UserBootServices.c
@@ -4,18 +4,27 @@
 **/
 
 #include <UserBootServices.h>
+#include <UserEvent.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
 
 EFI_BOOT_SERVICES  mBootServices = {
-  .RaiseTPL                  = DummyRaiseTPL,
-  .RestoreTPL                = DummyRestoreTPL,
   .LocateProtocol            = DummyLocateProtocol,
   .AllocatePages             = DummyAllocatePages,
   .InstallConfigurationTable = DummyInstallConfigurationTable,
-  .CalculateCrc32            = DummyCalculateCrc32
+  .CalculateCrc32            = DummyCalculateCrc32,
+
+  .CreateEventEx = UserCreateEventEx,
+  .CreateEvent   = UserCreateEvent,
+  .CloseEvent    = UserCloseEvent,
+  .CheckEvent    = UserCheckEvent,
+  .WaitForEvent  = UserWaitForEvent,
+  .SignalEvent   = UserSignalEvent,
+  .SetTimer      = UserSetTimer,
+  .RaiseTPL      = UserRaiseTPL,
+  .RestoreTPL    = UserRestoreTPL
 };
 
 EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  mConOut = {
diff --git a/User/Makefile b/User/Makefile
index 1839cd7e..0705af90 100644
--- a/User/Makefile
+++ b/User/Makefile
@@ -182,7 +182,7 @@ ifneq ($(STANDALONE),1)
 	#
 	# Customised/Simplified implementations at userspace level.
 	#
-	OBJS    += UserBaseMemoryLib.o UserBootServices.o UserGlobalVar.o UserMath.o UserMisc.o UserPcd.o UserUnicodeCollation.o UserOcDummy.o
+	OBJS    += UserBaseMemoryLib.o UserBootServices.o UserGlobalVar.o UserMath.o UserMisc.o UserPcd.o UserUnicodeCollation.o UserOcDummy.o UserEvent.o
 	#
 	# BaseOverflowLib targets.
 	#