diff --git a/src/barebox-state.c b/src/barebox-state.c
index 946a8db..f7bebd7 100644
--- a/src/barebox-state.c
+++ b/src/barebox-state.c
@@ -505,15 +505,15 @@
 		++nr_states;
 	}
 
-	lock_fd = open("/var/lock/barebox-state", O_CREAT | O_RDWR, 0600);
+	lock_fd = open("/run/barebox-state", O_CREAT | O_RDWR, 0600);
 	if (lock_fd < 0) {
-		pr_err("Failed to open lock-file /var/lock/barebox-state\n");
+		pr_err("Failed to open lock-file /run/barebox-state\n");
 		exit(1);
 	}
 
 	ret = flock(lock_fd, LOCK_EX);
 	if (ret < 0) {
-		pr_err("Failed to lock /var/lock/barebox-state: %m\n");
+		pr_err("Failed to lock /run/barebox-state: %m\n");
 		close(lock_fd);
 		exit(1);
 	}
diff --git a/src/libdt.c b/src/libdt.c
index bdfd409..105c10d 100644
--- a/src/libdt.c
+++ b/src/libdt.c
@@ -2057,6 +2057,7 @@
 	udev_enumerate_add_match_subsystem(enumerate, "i2c");
 	udev_enumerate_add_match_subsystem(enumerate, "spi");
 	udev_enumerate_add_match_subsystem(enumerate, "mtd");
+	udev_enumerate_add_match_subsystem(enumerate, "amba");
 	udev_enumerate_scan_devices(enumerate);
 	devices = udev_enumerate_get_list_entry(enumerate);