diff --git a/scripts/build/binary_hdd b/scripts/build/binary_hdd
index ac5247b19..8d24586c8 100755
--- a/scripts/build/binary_hdd
+++ b/scripts/build/binary_hdd
@@ -143,7 +143,8 @@ then
 	MAKEDEV=true
 
 	mv chroot/dev chroot/dev.tmp
-	find /dev | cpio -dmpu chroot
+	# Don't copy mount points (e.g. /dev/shm)
+	find /dev -xdev | cpio -dmpu chroot
 fi
 
 echo "!!! The following error/warning messages can be ignored !!!"
diff --git a/scripts/build/source_hdd b/scripts/build/source_hdd
index e207c1f9f..da7c91bca 100755
--- a/scripts/build/source_hdd
+++ b/scripts/build/source_hdd
@@ -67,7 +67,8 @@ then
 	MAKEDEV=true
 
 	mv chroot/dev chroot/dev.tmp
-	find /dev | cpio -dmpu chroot
+	# Don't copy mount points (e.g. /dev/shm)
+	find /dev -xdev| cpio -dmpu chroot
 fi
 
 case "${LB_BINARY_FILESYSTEM}" in