diff --git a/Makefile b/Makefile
index ba7d316..1d76fe7 100644
--- a/Makefile
+++ b/Makefile
@@ -2,13 +2,19 @@ GOARCH := $(GOARCH)
 GOOS := $(GOOS)
 FLAGS := -ldflags "-s -w"
 
-all:
+all: meshnamed whoami
+
+meshnamed:
 	GOARCH=$$GOARCH GOOS=$$GOOS go build $(FLAGS) ./cmd/meshnamed
 
+whoami:
+	GOARCH=$$GOARCH GOOS=$$GOOS go build $(FLAGS) ./cmd/whoami
+
 clean:
-	$(RM) meshnamed meshnamed.exe
+	$(RM) meshnamed meshnamed.exe whoami whoami.exe
 
 test:
 	go test pkg/meshname/*_test.go
 
 .PHONY: all clean test
+
diff --git a/whoami.go b/cmd/whoami/whoami.go
similarity index 99%
rename from whoami.go
rename to cmd/whoami/whoami.go
index 81c0b05..6845976 100644
--- a/whoami.go
+++ b/cmd/whoami/whoami.go
@@ -8,7 +8,6 @@ import (
 	"flag"
 )
 
-
 // define tld
 var tld = flag.String("tld", "mesh.cat", "The top level domain for our network")