diff --exclude='sbuild~' -ur sbuild-0.57.0-tabbott-backup/bin/sbuild sbuild-0.57.0-tabbott/bin/sbuild
--- sbuild-0.57.0-tabbott-backup/bin/sbuild	2008-03-30 00:24:54.000000000 -0400
+++ sbuild-0.57.0-tabbott/bin/sbuild	2008-03-30 00:32:27.000000000 -0400
@@ -246,12 +246,10 @@
     {
 	my $tpkg = basename($pkgv);
 
-	if ($main::binNMU || $main::append_to_version) {
-	    $tpkg =~ /^([^_]+)_([^_]+)(.*)$/;
-	    $tpkg = $1 . "_" . binNMU_version($2,$main::binNMUver,$main::append_to_version);
-	    $main::binNMU_name = $tpkg;
-	    $tpkg .= $3;
-	}
+	$tpkg =~ /^([^_]+)_([^_]+)(.*)$/;
+	$tpkg = $1 . "_" . binNMU_version($2,$main::binNMUver,$main::append_to_version);
+	$main::binNMU_name = $tpkg;
+	$tpkg .= $3;
 
 	next if !open_pkg_log( $tpkg, $main::distribution );
     }
@@ -608,7 +606,7 @@
 	    return 0;
 	}
 	my $tree_version = $1;
-	my $cmp_version = (($main::binNMU || $main::append_to_version) && -f "$dir/debian/.sbuild-binNMU-done") ?
+	my $cmp_version = -f "$dir/debian/.sbuild-binNMU-done" ?
 	    binNMU_version($version,$main::binNMUver,$main::append_to_version) : $version;
 	if ($tree_version ne $cmp_version) {
 	    print PLOG "The unpacked source tree $dir is version ".
@@ -806,9 +804,7 @@
 	    }
 	}
 
-	$changes = "${pkg}_".
-	    (($main::binNMU || $main::append_to_version) ? 
-	     binNMU_version($sversion,$main::binNMUver,$main::append_to_version) : $sversion).
+	$changes = "${pkg}_". binNMU_version($sversion,$main::binNMUver,$main::append_to_version).
 	    "_$main::arch.changes";
 	my @cfiles;
 	if (-r "$main::chroot_build_dir/$changes") {