diff --git a/sys/dev/gpio/acpi_gpiobus.c b/sys/dev/gpio/acpi_gpiobus.c
--- a/sys/dev/gpio/acpi_gpiobus.c
+++ b/sys/dev/gpio/acpi_gpiobus.c
@@ -355,6 +355,12 @@
 			aei_devi->gpiobus.pins[i] = aei_pins[i + 1];
 		free(aei_pins, M_DEVBUF);
 
+		status = AcpiAttachData(aei_handle, acpi_fake_objhandler,
+		    aei_child);
+		if (ACPI_FAILURE(status))
+			printf(
+			    "WARNING: Unable to attach object data to %s - %s\n",
+			    acpi_name(aei_handle), AcpiFormatException(status));
 		bus_attach_children(dev);
 	}
 
@@ -403,6 +409,16 @@
 	    sizeof(struct acpi_gpiobus_ivar)));
 }
 
+static void
+acpi_gpiobus_child_deleted(device_t bus, device_t child)
+{
+	struct acpi_gpiobus_ivar *devi = device_get_ivars(child);
+
+	if (acpi_get_device(devi->handle) == child)
+		AcpiDetachData(devi->handle, acpi_fake_objhandler);
+	gpiobus_child_deleted(bus, child);
+}
+
 static device_method_t acpi_gpiobus_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		acpi_gpiobus_probe),
@@ -412,6 +428,7 @@
 	/* Bus interface */
 	DEVMETHOD(bus_read_ivar,	acpi_gpiobus_read_ivar),
 	DEVMETHOD(bus_add_child,	acpi_gpiobus_add_child),
+	DEVMETHOD(bus_child_deleted,	acpi_gpiobus_child_deleted),
 
 	DEVMETHOD_END
 };
diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c
--- a/sys/dev/gpio/gpiobus.c
+++ b/sys/dev/gpio/gpiobus.c
@@ -721,7 +721,7 @@
 	    sizeof(struct gpiobus_ivar)));
 }
 
-static void
+void
 gpiobus_child_deleted(device_t dev, device_t child)
 {
 	struct gpiobus_ivar *devi;
diff --git a/sys/dev/gpio/gpiobus_internal.h b/sys/dev/gpio/gpiobus_internal.h
--- a/sys/dev/gpio/gpiobus_internal.h
+++ b/sys/dev/gpio/gpiobus_internal.h
@@ -42,6 +42,7 @@
 int gpiobus_read_ivar(device_t, device_t, int, uintptr_t *);
 int gpiobus_acquire_pin(device_t, uint32_t);
 void gpiobus_release_pin(device_t, uint32_t);
+void gpiobus_child_deleted(device_t, device_t);
 device_t gpiobus_add_child_common(device_t, u_int, const char *, int, size_t);
 
 extern driver_t gpiobus_driver;