Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 15962)
+++ /trunk/Config.kmk	(revision 15963)
@@ -388,4 +388,6 @@
 # Enable LsiLogic SCSI host adapter
 VBOX_WITH_LSILOGIC = 1
+# Enable HPET device
+#VBOX_WITH_HPET = 1
 # Enable SCSI drivers
 VBOX_WITH_SCSI = 1
Index: /trunk/include/VBox/log.h
===================================================================
--- /trunk/include/VBox/log.h	(revision 15962)
+++ /trunk/include/VBox/log.h	(revision 15963)
@@ -96,4 +96,6 @@
     /** Floppy Controller Device group. */
     LOG_GROUP_DEV_FDC,
+    /** High Precision Event Timer Device group. */
+    LOG_GROUP_DEV_HPET,
     /** IDE Device group. */
     LOG_GROUP_DEV_IDE,
@@ -351,4 +353,5 @@
     "DEV_E1000",    \
     "DEV_FDC",      \
+    "DEV_HPET",     \
     "DEV_IDE",      \
     "DEV_INIP",     \
Index: /trunk/src/VBox/Devices/Builtins.cpp
===================================================================
--- /trunk/src/VBox/Devices/Builtins.cpp	(revision 15962)
+++ /trunk/src/VBox/Devices/Builtins.cpp	(revision 15963)
@@ -79,4 +79,9 @@
     if (RT_FAILURE(rc))
         return rc;
+#ifdef VBOX_WITH_HPET
+    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceHPET);
+    if (RT_FAILURE(rc))
+        return rc;
+#endif
     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceMC146818);
     if (RT_FAILURE(rc))
Index: /trunk/src/VBox/Devices/Builtins.h
===================================================================
--- /trunk/src/VBox/Devices/Builtins.h	(revision 15962)
+++ /trunk/src/VBox/Devices/Builtins.h	(revision 15963)
@@ -38,4 +38,7 @@
 extern const PDMDEVREG g_DeviceI8254;
 extern const PDMDEVREG g_DeviceI8259;
+#ifdef VBOX_WITH_HPET
+extern const PDMDEVREG g_DeviceHPET;
+#endif
 extern const PDMDEVREG g_DeviceMC146818;
 extern const PDMDEVREG g_DevicePIIX3IDE;
Index: /trunk/src/VBox/Devices/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Devices/Makefile.kmk	(revision 15962)
+++ /trunk/src/VBox/Devices/Makefile.kmk	(revision 15963)
@@ -328,4 +328,9 @@
 endif
 
+ifdef VBOX_WITH_HPET
+DevicesR3_DEFS          += VBOX_WITH_HPET
+DevicesR3_SOURCES       += PC/DevHPET.cpp 
+endif
+
 ifdef VBOX_WITH_USB
 DevicesR3_DEFS         += VBOX_WITH_USB IN_USB_R3
@@ -425,4 +430,9 @@
 endif
 
+ifdef VBOX_WITH_HPET
+VBoxDDGC_DEFS          += VBOX_WITH_HPET
+VBoxDDGC_SOURCES       += PC/DevHPET.cpp 
+endif
+
 ifeq ($(VBOX_LDR_FMT32),pe)
 VBoxDDGC_LDFLAGS        = -Entry:vgaMMIOWrite
@@ -495,4 +505,9 @@
 endif
 
+ifdef VBOX_WITH_HPET
+VBoxDDR0_DEFS          += VBOX_WITH_HPET
+VBoxDDR0_SOURCES       += PC/DevHPET.cpp 
+endif
+
 ifeq ($(VBOX_LDR_FMT32),pe)
 VBoxDDR0_LDFLAGS        = -Entry:vgaMMIOWrite
@@ -501,5 +516,4 @@
 VBoxDDR0_LIBS           = $(PATH_LIB)/VMMR0Imp$(VBOX_SUFF_LIB)
 endif
-
 
 #