diff --git a/cmd/tiller/tiller.go b/cmd/tiller/tiller.go
index 98ccec73a..6e420d1ef 100644
--- a/cmd/tiller/tiller.go
+++ b/cmd/tiller/tiller.go
@@ -5,8 +5,8 @@ import (
 	"net"
 	"os"
 
-	"github.com/codegangsta/cli"
 	"github.com/deis/tiller/cmd/tiller/environment"
+	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
 )
 
@@ -16,16 +16,25 @@ import (
 var rootServer *grpc.Server = grpc.NewServer()
 var env = environment.New()
 
-func main() {
-	app := cli.NewApp()
-	app.Name = "tiller"
-	app.Usage = `The Helm server.`
-	app.Action = start
+const globalUsage = `The Kubernetes Helm server.
+
+Tiller is the server for Helm. It provides in-cluster resource management.
+
+By default, Tiller listens for gRPC connections on port 44134.
+`
 
-	app.Run(os.Args)
+var rootCommand = &cobra.Command{
+	Use:   "tiller",
+	Short: "The Kubernetes Helm server.",
+	Long:  globalUsage,
+	Run:   start,
+}
+
+func main() {
+	rootCommand.Execute()
 }
 
-func start(c *cli.Context) {
+func start(c *cobra.Command, args []string) {
 	addr := ":44134"
 	lstn, err := net.Listen("tcp", addr)
 	if err != nil {
diff --git a/glide.lock b/glide.lock
index ed5d5e980..f73ce1e65 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,12 +1,10 @@
-hash: 264d156a2a07d53efbf5f608ead3eb31c261de5124e0235139b3f99c6ead4dba
-updated: 2016-04-18T17:25:07.662942088-06:00
+hash: 23af9670ae8c1600f0f3c70bd9191e0df9211fed1e57430160aed95d5c71c2d1
+updated: 2016-04-20T17:16:04.782839628-06:00
 imports:
 - name: github.com/aokoli/goutils
   version: 9c37978a95bd5c709a15883b6242714ea6709e64
 - name: github.com/BurntSushi/toml
   version: bbd5bb678321a0d6e58f1099321dfa73391c1b6f
-- name: github.com/codegangsta/cli
-  version: 71f57d300dd6a780ac1856c005c4b518cfd498ec
 - name: github.com/golang/protobuf
   version: f0a097ddac24fb00e07d2ac17f8671423f3ea47c
   subpackages:
diff --git a/glide.yaml b/glide.yaml
index 7560443da..962fb5aee 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -1,6 +1,5 @@
 package: github.com/deis/tiller
 import:
-- package: google.golang.org/grpc
 - package: golang.org/x/net
   subpackages:
   - context
@@ -14,3 +13,7 @@ import:
   version: 1.1.0
 - package: github.com/BurntSushi/toml
 - package: github.com/technosophos/moniker
+- package: github.com/golang/protobuf
+  version: f0a097ddac24fb00e07d2ac17f8671423f3ea47c
+- package: google.golang.org/grpc
+  version: dec33edc378cf4971a2741cfd86ed70a644d6ba3