diff --git a/Makefile b/Makefile
index e5cf17177..53a8a4201 100644
--- a/Makefile
+++ b/Makefile
@@ -14,9 +14,7 @@ stage_build:
 
 
 build: stage_build
-	go install github.com/minios/minios/minios
-	go install github.com/minios/minios/miniosd
-	cp tmp/gopath/bin/* bin/
+	go install github.com/minios/minios/minio
 
 clean:
 	rm -rf tmp bin
diff --git a/miniosd/main.go b/minio/main.go
similarity index 76%
rename from miniosd/main.go
rename to minio/main.go
index 8391b5d41..7a7cfa6f7 100644
--- a/miniosd/main.go
+++ b/minio/main.go
@@ -5,6 +5,6 @@ import (
 )
 
 func main() {
-	server := minios.Server{}
+	server := minio.Server{}
 	server.Start()
 }
diff --git a/minios/main.go b/minios/main.go
deleted file mode 100644
index d8fa92921..000000000
--- a/minios/main.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package main
-
-import "fmt"
-
-func main() {
-	fmt.Println("hello")
-}
diff --git a/server.go b/server.go
index 6c5e021be..2e992a1a6 100644
--- a/server.go
+++ b/server.go
@@ -1,4 +1,4 @@
-package minios
+package minio
 
 import (
 	"fmt"