--- a/dupload	2011-06-10 11:18:34.000000000 +0200
+++ b/dupload	2011-06-10 11:13:45.000000000 +0200
@@ -519,6 +519,8 @@
 	fatal("Unknown upload method\n");
 }
 
+chdir $cwd or fatal("Can't chdir to $cwd: $!\n");
+
 JOB: foreach (keys %files) {
 	my $job = $_;
 	my @files = @{$files{$job}};
@@ -536,7 +538,6 @@
 	$incoming =~ s/_upstream_/$upstream/g;
 	$incoming =~ s/_debian_/$debian/g;
 
-	chdir $cwd or fatal("Can't chdir to $cwd: $!\n");
 	chdir $dir{$job} or fatal("Can't chdir to $dir{$job}: $!\n");
 
 	p "[ Uploading job $job";
@@ -709,8 +710,12 @@
         }
 	p " ]\n";
 
+} continue {
+    chdir $cwd or fatal("Can't chdir to $cwd: $!\n");
 }
 
+chdir $cwd or fatal("Can't chdir to $cwd: $!\n");
+
 if ($method eq "ftp") {
   unless ($dry) {
     $server->close();