diff --git a/Makefile b/Makefile
index c001b61..b734963 100644
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,7 @@ test:
 build: $(DIST)/$(EXECUTABLE)
 
 $(DIST)/$(EXECUTABLE): $(SOURCES)
-	$(GO) build -v -tags '$(TAGS)' -ldflags '-extldflags "-static" $(LDFLAGS)' -o $@ ./admin
+	$(GO) build -v -tags '$(TAGS)' -ldflags '-extldflags "-static" $(LDFLAGS)' -o $@ ./cmd/$(EXECUTABLE)
 
 $(DIST_DIRS):
 	mkdir -p $(DIST_DIRS)
diff --git a/admin/main.go b/cmd/drone-admin/main.go
similarity index 100%
rename from admin/main.go
rename to cmd/drone-admin/main.go