diff --git a/ports/run/genode_org.run b/ports/run/genode_org.run
index d88431c6d..c724779f4 100644
--- a/ports/run/genode_org.run
+++ b/ports/run/genode_org.run
@@ -11,14 +11,22 @@
 
 set build_components {
 	core init
-	drivers/pci
-	drivers/nic
 	drivers/timer
 	server/tar_fs
 	app/lighttpd
 }
 
-lappend_if [have_spec omap4] build_components drivers/usb
+set use_usb_driver      [expr [have_spec omap4] || [have_spec exynos5]]
+set use_nic_driver      [expr !$use_usb_driver]
+set use_platform_driver [expr $use_usb_driver && [have_spec foc_arndale]]
+if {$use_usb_driver}    { set network_driver "usb_drv" }
+if {$use_nic_driver}    { set network_driver "nic_drv" }
+
+lappend_if $use_platform_driver build_components drivers/platform
+lappend_if $use_usb_driver      build_components drivers/usb
+lappend_if $use_nic_driver      build_components drivers/nic
+lappend_if [have_spec acpi]     build_components drivers/acpi
+lappend_if [have_spec pci]      build_components drivers/pci/device_pd
 
 build $build_components
 
@@ -47,31 +55,49 @@ append config {
 		<provides><service name="Timer"/></provides>
 	</start>}
 
-append_if [have_spec pci] config {
-	<start name="pci_drv">
-		<resource name="RAM" quantum="1M"/>
-		<provides><service name="PCI"/></provides>
+append_if $use_platform_driver config {
+	<start name="platform_drv">
+		<resource name="RAM" quantum="1M" />
+		<provides><service name="Regulator"/></provides>
 	</start>}
 
-append_if [have_spec omap4] config {
+append_if $use_usb_driver config {
 	<start name="usb_drv">
 		<resource name="RAM" quantum="12M"/>
 		<provides>
-			<service name="Input"/>
 			<service name="Nic"/>
 		</provides>
 		<config ehci="yes">
-			<hid/>
-			<nic mac="2e:60:90:0c:4e:01" />
+			<nic mac="2e:60:90:0c:4e:05" />
 		</config>
 	</start>}
 
-append_if [expr ![have_spec omap4]] config {
+append_if $use_nic_driver config {
 	<start name="nic_drv">
 		<resource name="RAM" quantum="4M"/>
 		<provides><service name="Nic"/></provides>
 	</start>}
 
+append_if [have_spec acpi] config {
+	<start name="acpi">
+		<resource name="RAM" quantum="6M"/>
+		<binary name="acpi_drv"/>
+		<provides>
+			<service name="PCI"/>
+			<service name="IRQ" />
+		</provides>
+		<route>
+			<service name="PCI"> <any-child /> </service>
+			<any-service> <parent/> <any-child /> </any-service>
+		</route>
+	</start>}
+
+append_if [expr ![have_spec acpi] && [have_spec pci]] config {
+	<start name="pci_drv">
+		<resource name="RAM" quantum="3M"/>
+		<provides> <service name="PCI"/> </provides>
+	</start> }
+
 append config {
 	<start name="tar_fs">
 		<resource name="RAM" quantum="10M"/>
@@ -149,9 +175,12 @@ set boot_modules {
 }
 
 # platform-specific modules
+lappend_if $use_platform_driver      boot_modules platform_drv
+lappend_if [have_spec acpi]          boot_modules acpi_drv
 lappend_if [have_spec pci]           boot_modules pci_drv
-lappend_if [have_spec omap4]         boot_modules usb_drv
-lappend_if [expr ![have_spec omap4]] boot_modules nic_drv
+lappend_if $use_usb_driver           boot_modules usb_drv
+lappend_if $use_nic_driver           boot_modules nic_drv
+lappend_if [have_spec nova]          boot_modules pci_device_pd
 
 build_boot_image $boot_modules