Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 41751)
+++ /trunk/Config.kmk	(revision 41752)
@@ -985,4 +985,6 @@
  VBOX_WITH_TESTSUITE=
  VBOX_WITH_INTEL_PXE=
+ ## @todo remove once the iPXE code is in public tree
+ VBOX_WITHOUT_IPXE=1
  VBOX_WITH_FFMPEG=
  # Disable for OSE, requires snv_159+.
Index: /trunk/src/VBox/Devices/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Devices/Makefile.kmk	(revision 41751)
+++ /trunk/src/VBox/Devices/Makefile.kmk	(revision 41752)
@@ -24,6 +24,11 @@
 if defined(VBOX_WITH_INTEL_PXE) || defined(VBOX_ONLY_EXTPACKS)
  include $(PATH_SUB_CURRENT)/PC/PXE/Makefile.kmk
-else if defined(VBOX_WITH_PXE_ROM) && !defined(VBOX_WITHOUT_ETHERBOOT)
- include $(PATH_SUB_CURRENT)/PC/Etherboot-src/Makefile.kmk
+else if defined(VBOX_WITH_PXE_ROM)
+ if !defined(VBOX_WITHOUT_ETHERBOOT)
+  include $(PATH_SUB_CURRENT)/PC/Etherboot-src/Makefile.kmk
+ endif
+ if !defined(VBOX_WITHOUT_IPXE)
+  include $(PATH_SUB_CURRENT)/PC/ipxe/Makefile.kmk
+ endif
 endif
 if !defined(VBOX_ONLY_EXTPACKS)         # Goes on almost to the end of the file.
@@ -254,5 +259,5 @@
  	Graphics/DevVGA_VDMA.cpp
  endif
- 
+
  ifdef VBOX_VDMA_WITH_WATCHDOG
   VBoxDD_DEFS           += VBOX_VDMA_WITH_WATCHDOG
@@ -903,5 +908,5 @@
  	$(PATH_STAGE_LIB)/PcBiosBin$(VBOX_SUFF_LIB) \
  	$(PATH_STAGE_LIB)/VgaBiosBin$(VBOX_SUFF_LIB) \
- 	$(if $(VBOX_WITH_PXE_ROM),$(PATH_STAGE_LIB)/NetBiosBin$(VBOX_SUFF_LIB),) \
+ 	$(if $(VBOX_WITH_PXE_ROM),$(if $(VBOX_WITHOUT_IPXE),(PATH_STAGE_LIB)/NetBiosBin$(VBOX_SUFF_LIB),$(PATH_STAGE_LIB)/iPxeBiosBin$(VBOX_SUFF_LIB)),) \
  	$(LIB_VMM) \
  	$(LIB_RUNTIME)
Index: /trunk/src/VBox/Devices/build/VBoxDD2.cpp
===================================================================
--- /trunk/src/VBox/Devices/build/VBoxDD2.cpp	(revision 41751)
+++ /trunk/src/VBox/Devices/build/VBoxDD2.cpp	(revision 41752)
@@ -1,3 +1,3 @@
-/* $Id $ */
+/* $Id$ */
 /** @file
  * VBoxDD2 - Built-in drivers & devices part 2.
@@ -7,5 +7,5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
Index: /trunk/src/VBox/Devices/build/VBoxDD2.h
===================================================================
--- /trunk/src/VBox/Devices/build/VBoxDD2.h	(revision 41751)
+++ /trunk/src/VBox/Devices/build/VBoxDD2.h	(revision 41752)
@@ -7,5 +7,5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as