diff --git a/.gitignore b/.gitignore
index 2c63e103..3377ccb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-docker-machine*
 *.log
 *.iml
 .idea/
diff --git a/appveyor.yml b/appveyor.yml
index cd1397a4..a32b5620 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,7 +10,7 @@ environment:
 clone_folder: c:\gopath\src\github.com\docker\machine
 
 build_script:
-  - go build -i -o ./bin/docker-machine.exe ./cmd/machine.go
+  - go build -i -o ./bin/docker-machine.exe ./cmd/docker-machine
 
 test_script:
   - powershell -Command go test -v ./libmachine/shell
diff --git a/cmd/machine.go b/cmd/docker-machine/machine.go
similarity index 100%
rename from cmd/machine.go
rename to cmd/docker-machine/machine.go
diff --git a/cmd/machine_test.go b/cmd/docker-machine/machine_test.go
similarity index 100%
rename from cmd/machine_test.go
rename to cmd/docker-machine/machine_test.go
diff --git a/mk/build.mk b/mk/build.mk
index adbe6a62..b69acf19 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -18,7 +18,7 @@ define gocross
 		$(GO) build \
 		-o $(PREFIX)/bin/$(PKG_NAME)-${os.$(1)}-${arch.$(2)}$(call extension,$(GOOS)) \
 		-a $(VERBOSE_GO) -tags "static_build netgo $(BUILDTAGS)" -installsuffix netgo \
-		-ldflags "$(GO_LDFLAGS) -extldflags -static" $(GO_GCFLAGS) ./cmd/machine.go;)
+		-ldflags "$(GO_LDFLAGS) -extldflags -static" $(GO_GCFLAGS) ./cmd/docker-machine;)
 endef
 
 build-clean:
@@ -31,6 +31,6 @@ $(PREFIX)/bin/$(PKG_NAME)$(call extension,$(GOOS)): $(shell find . -type f -name
 	$(GO) build \
 	-o $@ \
 	$(VERBOSE_GO) -tags "$(BUILDTAGS)" \
-	-ldflags "$(GO_LDFLAGS)" $(GO_GCFLAGS) ./cmd/machine.go
+	-ldflags "$(GO_LDFLAGS)" $(GO_GCFLAGS) ./cmd/docker-machine
 
 build: $(PREFIX)/bin/$(PKG_NAME)$(call extension,$(GOOS))