diff --git a/cmd/zpool_layout/zpool_layout b/cmd/zpool_layout/zpool_layout
index 432c1576e..7f19dc0e9 100755
--- a/cmd/zpool_layout/zpool_layout
+++ b/cmd/zpool_layout/zpool_layout
@@ -153,7 +153,7 @@ exec 1>&8 8>&-
 popd >/dev/null
 
 if [ ${TRIGGER} = "yes" ]; then
-	udevadm trigger
+	udevadm trigger --action=change --subsystem-match=block
 	udevadm settle
 fi
 
diff --git a/scripts/common.sh.in b/scripts/common.sh.in
index 2583efcb2..cf5585945 100644
--- a/scripts/common.sh.in
+++ b/scripts/common.sh.in
@@ -430,7 +430,7 @@ scsi_rescan() {
 #
 udev_trigger() {
 	if [ -f ${UDEVADM} ]; then
-		${UDEVADM} trigger
+		${UDEVADM} trigger --action=change --subsystem-match=block
 		${UDEVADM} settle
 	else
 		/sbin/udevtrigger