Index: locker/update-system/bin/build-update
===================================================================
--- locker/update-system/bin/build-update	(revision 446)
+++ locker/update-system/bin/build-update	(revision 447)
@@ -52,5 +52,5 @@
 
 open(CHECKMD5, ">", catfile($outdir, "check.md5")) or die "Can't open check.md5: $!";
-print CHECKMD5 map { join(" ", @{$_})."\n" } @todelete, @toreplace;
+print CHECKMD5 map { join("  ", @{$_})."\n" } @todelete, @toreplace;
 close(CHECKMD5);
 
@@ -92,10 +92,10 @@
 xargs -n1 test ! -e <"$patchdir/oldfiles.absent" || die "error: Conflicting files exist."
 md5sum -c "$patchdir/check.md5" || die "error: MD5 check failed."
-patch -stN --dry-run --no-backup-if-mismatch -p1 <"$patchdir/update.diff" || due "error: Patch dry run failed."
+patch -stN --dry-run --no-backup-if-mismatch -p2 <"$patchdir/update.diff" || due "error: Patch dry run failed."
 
 echo "[$PWD] dry run OK, applying update"
 
 mv .scripts-version .scripts-version.old
-patch -stN --no-backup-if-mismatch -p1 <"$patchdir/update.diff" || :
+patch -stN --no-backup-if-mismatch -p2 <"$patchdir/update.diff" || :
 xargs rm -f <"$patchdir/files.delete"
 cp -a "$patchdir/newfiles/." .