-system "rm -rf rsync-$version rsync-$lastversion";
-system "tar xzf $tar_file; tar xzf $diffdir/rsync-$lastversion.tar.gz";
-## TWEAK THE VERSIONS AS DESIRED HERE ##
-#mkdir("rsync-$lastversion/support", 0755) or die $!;
-#rename("rsync-$lastversion/rsyncstats", "rsync-$lastversion/support/rsyncstats");
-unlink("rsync-$lastversion/.ignore");
-## END ##
-system "diff -urN --exclude=patches rsync-$lastversion rsync-$version| gzip -9 >$diff_file";
+@_ = @extra_files;
+map { s#^#rsync-$lastversion/# } @_;
+system "tar xzf $lasttar_file @_";
+rename("rsync-$lastversion", 'a');
+system "make gen; rsync -a @extra_files b/";
+my $sed_script = 's:^((---|\+\+\+) [ab]/[^\t]+)\t.*:\1:';
+system "(git diff v$lastversion v$version; diff -up a b | sed -r '$sed_script') | gzip -9 >$diff_file";
+system "rm -rf a";
+rename('b', "rsync-$version");
+
+print "Creating $srctar_file ...\n";
+system "git archive --format=tar --prefix=rsync-$version/ v$version | tar xf -";
+system "support/git-set-file-times --prefix=rsync-$version/";
+system "fakeroot tar czf $srctar_file rsync-$version; rm -rf rsync-$version";
+
+system "support/patch-update --gen";
+
+symlink('.', "rsync-$version");
+system "fakeroot tar czf $pattar_file rsync-$version/patches";
+unlink("rsync-$version");