diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go
index 77f74d935cf242b8b229102294d83e5c6b762c66..93abb645fad34d363d654c66574e5707ec1d2252 100644
--- a/cmd/helm/helm.go
+++ b/cmd/helm/helm.go
@@ -84,7 +84,6 @@ func newRootCmd(args []string) *cobra.Command {
 		newPackageCmd(out),
 		newRepoCmd(out),
 		newSearchCmd(out),
-		newServeCmd(out),
 		newVerifyCmd(out),
 
 		// release commands
diff --git a/cmd/helm/serve.go b/cmd/helm/serve.go
deleted file mode 100644
index 21ae36da1462dc7c004ba1e6f5242b52603d76d7..0000000000000000000000000000000000000000
--- a/cmd/helm/serve.go
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
-Copyright 2016 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-
-	"github.com/spf13/cobra"
-
-	"k8s.io/helm/pkg/repo"
-)
-
-const serveDesc = `
-This command starts a local chart repository server that serves charts from a local directory.
-
-The new server will provide HTTP access to a repository. By default, it will
-scan all of the charts in '$HELM_HOME/repository/local' and serve those over
-the local IPv4 TCP port (default '127.0.0.1:8879').
-
-This command is intended to be used for educational and testing purposes only.
-It is best to rely on a dedicated web server or a cloud-hosted solution like
-Google Cloud Storage for production use.
-
-See https://github.com/kubernetes/helm/blob/master/docs/chart_repository.md#hosting-chart-repositories
-for more information on hosting chart repositories in a production setting.
-`
-
-type serveCmd struct {
-	out      io.Writer
-	url      string
-	address  string
-	repoPath string
-}
-
-func newServeCmd(out io.Writer) *cobra.Command {
-	srv := &serveCmd{out: out}
-	cmd := &cobra.Command{
-		Use:   "serve",
-		Short: "start a local http web server",
-		Long:  serveDesc,
-		PreRunE: func(cmd *cobra.Command, args []string) error {
-			return srv.complete()
-		},
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return srv.run()
-		},
-	}
-
-	f := cmd.Flags()
-	f.StringVar(&srv.repoPath, "repo-path", "", "local directory path from which to serve charts")
-	f.StringVar(&srv.address, "address", "127.0.0.1:8879", "address to listen on")
-	f.StringVar(&srv.url, "url", "", "external URL of chart repository")
-
-	return cmd
-}
-
-func (s *serveCmd) complete() error {
-	if s.repoPath == "" {
-		s.repoPath = settings.Home.LocalRepository()
-	}
-	return nil
-}
-
-func (s *serveCmd) run() error {
-	repoPath, err := filepath.Abs(s.repoPath)
-	if err != nil {
-		return err
-	}
-	if _, err := os.Stat(repoPath); os.IsNotExist(err) {
-		return err
-	}
-
-	fmt.Fprintln(s.out, "Regenerating index. This may take a moment.")
-	if len(s.url) > 0 {
-		err = index(repoPath, s.url, "")
-	} else {
-		err = index(repoPath, "http://"+s.address, "")
-	}
-	if err != nil {
-		return err
-	}
-
-	fmt.Fprintf(s.out, "Now serving you on %s\n", s.address)
-	return repo.StartLocalRepo(repoPath, s.address)
-}