diff --git a/build b/build
index df1d57d..13f2979 100755
--- a/build
+++ b/build
@@ -405,8 +405,7 @@ fi
 # Get git/hg version info for the build
 repover="main.RepoVersion=$Repover"
 prodver="main.ProductVersion=$Prodver"
-date="main.Buildtime=`date -u '+%Y-%m-%dT%H:%M.%SZ'`"
-ldflags="-ldflags \"-X $repover -X $prodver -X $date $ldflags -buildid=\""
+ldflags="-ldflags \"-X $repover -X $prodver $ldflags -buildid=\""
 vflag=""
 
 [ $Verbose -gt 0 ] && vflag="-v"
diff --git a/src/sigtool.go b/src/sigtool.go
index faae6f2..f22975a 100644
--- a/src/sigtool.go
+++ b/src/sigtool.go
@@ -38,7 +38,7 @@ func main() {
 	mf.Parse(os.Args[1:])
 
 	if ver {
-		fmt.Printf("%s - %s [%s; %s]\n", Z, ProductVersion, RepoVersion, Buildtime)
+		fmt.Printf("%s - %s [%s]\n", Z, ProductVersion, RepoVersion)
 		os.Exit(0)
 	}
 
@@ -124,7 +124,6 @@ func exists(nm string) bool {
 
 // This will be filled in by "build"
 var RepoVersion string = "UNDEFINED"
-var Buildtime string = "UNDEFINED"
 var ProductVersion string = "UNDEFINED"
 
 // vim: ft=go:sw=8:ts=8:noexpandtab:tw=98:
diff --git a/tests.sh b/tests.sh
index a5d81d9..262fc3d 100755
--- a/tests.sh
+++ b/tests.sh
@@ -84,8 +84,8 @@ $bin s --no-password $ssk1 -o $sig $0       || die "can't sign with $ssk1"
 $bin v -q $spk1 $sig $0                     || die "can't verify with $spk2"
 $bin v -q $spk1_str $sig $0                 || die "can't verify with $spk2_str"
 
-$bin e --no-password -o $encout $spk2 $0         || die "can't encrypt to $spk2 with $ssk1"
-$bin d --no-password -o $decout $ssk2 $encout    || die "can't decrypt with $ssk2"
+$bin e --no-password -o $encout $spk2 $0       || die "can't encrypt to $spk2 with $ssk1"
+$bin d --no-password -o $decout $ssk2 $encout  || die "can't decrypt with $ssk2"
 
 # cleanup state
 rm -f $sig $encout $decout
@@ -104,8 +104,8 @@ pk2_str=$(cat $pk2 | grep 'pk:' | sed -e 's/^pk: //g')
 $bin s -E FOO $sk $0 -o $sig            || die "can't sign $0"
 $bin v -q $pk $sig $0                   || die "can't verify signature of $0"
 $bin v -q $pk_str $sig $0               || die "can't verify signature of $0"
-$bin v -q $pk2 $sig $0 2>/dev/null && die "bad verification with wrong $pk2"
-$bin v -q $pk2_str $sig $0 2>/dev/null && die "bad verification with wrong $pk2"
+$bin v -q $pk2 $sig $0 2>/dev/null      && die "bad verification with wrong $pk2"
+$bin v -q $pk2_str $sig $0 2>/dev/null  && die "bad verification with wrong $pk2"
 
 # encrypt/decrypt
 $bin e -E FOO -o $encout $pk2 $0      || die "can't encrypt to $pk2"