diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index c532227..64c4fdc 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -584,3 +584,4 @@ x86/xen/xenpv.c			optional	xenhvm
 x86/xen/xen_nexus.c		optional	xenhvm
 x86/xen/xen_msi.c		optional	xenhvm
 x86/xen/xen_pci.c		optional	xenhvm
+x86/xen/xen_acpi_pci.c		optional	xenhvm
diff --git a/sys/x86/xen/xen_acpi_pci.c b/sys/x86/xen/xen_acpi_pci.c
new file mode 100644
index 0000000..7598253
--- /dev/null
+++ b/sys/x86/xen/xen_acpi_pci.c
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2014 Roger Pau Monné <roger.pau@citrix.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/module.h>
+
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+
+#include <dev/acpica/acpivar.h>
+
+#include <sys/pciio.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pci_private.h>
+
+#include <xen/xen-os.h>
+#include <xen/hypervisor.h>
+
+#include "pcib_if.h"
+#include "pci_if.h"
+
+static int xen_acpi_pci_probe(device_t dev);
+
+extern void xen_pci_enable_msi_method(device_t dev, device_t child,
+    uint64_t address, uint16_t data);
+extern void xen_pci_disable_msi_method(device_t dev, device_t child);
+extern void xen_pci_child_added_method(device_t dev, device_t child);
+
+static device_method_t xen_acpi_pci_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		xen_acpi_pci_probe),
+
+	/* PCI interface overwrites */
+	DEVMETHOD(pci_enable_msi,	xen_pci_enable_msi_method),
+	DEVMETHOD(pci_disable_msi,	xen_pci_disable_msi_method),
+	DEVMETHOD(pci_child_added,	xen_pci_child_added_method),
+
+	DEVMETHOD_END
+};
+
+static devclass_t pci_devclass;
+
+DECLARE_CLASS(acpi_pci_driver);
+DEFINE_CLASS_1(pci, xen_acpi_pci_driver, xen_acpi_pci_methods,
+    sizeof(struct pci_softc), acpi_pci_driver);
+DRIVER_MODULE(xen_acpi_pci, pcib, xen_acpi_pci_driver, pci_devclass, 0, 0);
+MODULE_DEPEND(xen_acpi_pci, pci, 1, 1, 1);
+MODULE_DEPEND(xen_acpi_pci, acpi, 1, 1, 1);
+MODULE_VERSION(xen_acpi_pci, 1);
+
+static int
+xen_acpi_pci_probe(device_t dev)
+{
+
+	if (!xen_pv_domain())
+		return (ENXIO);
+	if (acpi_get_handle(dev) == NULL)
+		return (ENXIO);
+
+	device_set_desc(dev, "Xen ACPI PCI bus");
+
+	return (BUS_PROBE_SPECIFIC);
+}
diff --git a/sys/x86/xen/xen_pci.c b/sys/x86/xen/xen_pci.c
index d4a427d..18078af 100644
--- a/sys/x86/xen/xen_pci.c
+++ b/sys/x86/xen/xen_pci.c
@@ -47,10 +47,10 @@ __FBSDID("$FreeBSD$");
 
 static int xen_pci_probe(device_t dev);
 
-static void xen_pci_enable_msi_method(device_t dev, device_t child,
+void xen_pci_enable_msi_method(device_t dev, device_t child,
     uint64_t address, uint16_t data);
-static void xen_pci_disable_msi_method(device_t dev, device_t child);
-static void xen_pci_child_added_method(device_t dev, device_t child);
+void xen_pci_disable_msi_method(device_t dev, device_t child);
+void xen_pci_child_added_method(device_t dev, device_t child);
 
 static device_method_t xen_pci_methods[] = {
 	/* Device interface */
@@ -66,27 +66,26 @@ static device_method_t xen_pci_methods[] = {
 
 static devclass_t pci_devclass;
 
-DECLARE_CLASS(acpi_pci_driver);
+DECLARE_CLASS(pci_driver);
 DEFINE_CLASS_1(pci, xen_pci_driver, xen_pci_methods, sizeof(struct pci_softc),
-    acpi_pci_driver);
+    pci_driver);
 DRIVER_MODULE(xen_pci, pcib, xen_pci_driver, pci_devclass, 0, 0);
 MODULE_DEPEND(xen_pci, pci, 1, 1, 1);
-MODULE_DEPEND(xen_pci, acpi, 1, 1, 1);
 MODULE_VERSION(xen_pci, 1);
 
 static int
 xen_pci_probe(device_t dev)
 {
 
-	device_set_desc(dev, "Xen PCI bus");
-
 	if (!xen_pv_domain())
 		return (ENXIO);
 
-	return (BUS_PROBE_SPECIFIC);
+	device_set_desc(dev, "Xen PCI bus");
+
+	return (BUS_PROBE_DEFAULT);
 }
 
-static void
+void
 xen_pci_enable_msi_method(device_t dev, device_t child, uint64_t address,
      uint16_t data)
 {
@@ -99,7 +98,7 @@ xen_pci_enable_msi_method(device_t dev, device_t child, uint64_t address,
 	    msi->msi_ctrl, 2);
 }
 
-static void
+void
 xen_pci_disable_msi_method(device_t dev, device_t child)
 {
 	struct pci_devinfo *dinfo = device_get_ivars(child);
@@ -110,7 +109,7 @@ xen_pci_disable_msi_method(device_t dev, device_t child)
 	    msi->msi_ctrl, 2);
 }
 
-static void
+void
 xen_pci_child_added_method(device_t dev, device_t child)
 {
 	struct pci_devinfo *dinfo;