diff --git a/.gitignore b/.gitignore
index 9e18d403..57b8620a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,6 @@ test-coverage.out
 /bigsky
 /bluepages
 /fakermaker
-/goat
 /gosky
 /hepa
 /lexgen
diff --git a/Makefile b/Makefile
index 25c9601d..7d506f30 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,6 @@ help: ## Print info about all commands
 
 .PHONY: build
 build: ## Build all executables
-	go build ./cmd/goat
 	go build ./cmd/gosky
 	go build ./cmd/bigsky
 	go build ./cmd/relay
diff --git a/atproto/repo/cmd/repo-tool/firehose.go b/atproto/repo/cmd/repo-tool/firehose.go
index 2f351659..bd54fa10 100644
--- a/atproto/repo/cmd/repo-tool/firehose.go
+++ b/atproto/repo/cmd/repo-tool/firehose.go
@@ -36,7 +36,7 @@ func runVerifyFirehose(cctx *cli.Context) error {
 	}
 	u.Path = "xrpc/com.atproto.sync.subscribeRepos"
 	con, _, err := dialer.Dial(u.String(), http.Header{
-		"User-Agent": []string{fmt.Sprintf("goat/%s", versioninfo.Short())},
+		"User-Agent": []string{fmt.Sprintf("at-repo-tool/%s", versioninfo.Short())},
 	})
 	if err != nil {
 		return fmt.Errorf("subscribing to firehose failed (dialing): %w", err)
diff --git a/cmd/relay/README.md b/cmd/relay/README.md
index 7bf92b4b..6c5d280d 100644
--- a/cmd/relay/README.md
+++ b/cmd/relay/README.md
@@ -66,7 +66,7 @@ Request crawl of an individual PDS instance like:
 
     http post :2470/admin/pds/requestCrawl -a admin:dummy hostname=pds.example.com
 
-The `goat` command line tool (also part of the indigo git repository) includes helpers for administering, inspecting, and debugging relays:
+The `goat` command line tool includes helpers for administering, inspecting, and debugging relays:
 
     RELAY_HOST=http://localhost:2470 goat firehose --verify-mst
     RELAY_HOST=http://localhost:2470 goat relay admin host list