diff --git a/cmd/updatestd/updatestd.go b/cmd/updatestd/updatestd.go
index f1d917c..d1eefd1 100644
--- a/cmd/updatestd/updatestd.go
+++ b/cmd/updatestd/updatestd.go
@@ -11,6 +11,7 @@
 import (
 	"bytes"
 	"context"
+	"debug/buildinfo"
 	"encoding/json"
 	"errors"
 	"flag"
@@ -61,6 +62,10 @@
 	if err != nil {
 		log.Fatalln("can't find bundle in PATH; did you run 'go install golang.org/x/tools/cmd/bundle@latest' and add it to PATH?")
 	}
+	if bi, err := buildinfo.ReadFile(bundlePath); err != nil || bi.Path != "golang.org/x/tools/cmd/bundle" {
+		// Not the bundle command we want.
+		log.Fatalln("unexpected bundle command in PATH; did you run 'go install golang.org/x/tools/cmd/bundle@latest' and add it to PATH?")
+	}
 
 	// Fetch latest hashes of Go projects from Gerrit,
 	// using the specified branch name.