-my $srctar_file = "$dest/$srctar_name";
-my $pattar_file = "$dest/$pattar_name";
-my $diff_file = "$dest/$diff_name";
-my $lasttar_file = "$dest/rsync-$lastversion.tar.gz";
+my $srctar_file = "$dest/$srcdir/$srctar_name";
+my $pattar_file = "$dest/$srcdir/$pattar_name";
+my $diff_file = "$dest/$srcdiffdir/$diff_name";
+my $news_file = "$dest/$srcdir/rsync-$version-NEWS";
+my $lasttar_file = "$dest/$lastsrcdir/rsync-$lastversion.tar.gz";
+
+print $break, <<EOT;
+
+About to:
+ - commit all version changes
+ - merge the $master_branch branch into the patch/* branches
+ - update the files in the "patches" dir and OPTIONALLY
+ (if you type 'y') to launch a shell for each patch
+
+EOT
+print "<Press Enter OR 'y' to continue> ";
+my $ans = <STDIN>;
+
+system "git commit -a -m 'Preparing for release of $version'" and exit 1;
+
+print "Updating files in \"patches\" dir ...\n";
+system "packaging/patch-update --branch=$master_branch";
+
+if ($ans =~ /^y/i) {
+ print "\nVisiting all \"patch/*\" branches ...\n";
+ system "packaging/patch-update --branch=$master_branch --shell";
+}