diff --git a/etcdctl/command/upgrade.go b/etcdctl/command/upgrade.go
new file mode 100644
index 000000000..e7e895df6
--- /dev/null
+++ b/etcdctl/command/upgrade.go
@@ -0,0 +1,69 @@
+/*
+   Copyright 2015 CoreOS, Inc.
+
+   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 command
+
+import (
+	"fmt"
+	"log"
+	"net/http"
+	"os"
+
+	"github.com/coreos/etcd/Godeps/_workspace/src/github.com/codegangsta/cli"
+)
+
+func UpgradeCommand() cli.Command {
+	return cli.Command{
+		Name:  "upgrade",
+		Usage: "upgrade an old version etcd cluster to a new version",
+		Flags: []cli.Flag{
+			cli.StringFlag{Name: "old-version", Value: "1", Usage: "Old internal version"},
+			cli.StringFlag{Name: "new-version", Value: "2", Usage: "New internal version"},
+			cli.StringFlag{Name: "peer-url", Value: "", Usage: "An etcd peer url string"},
+		},
+		Action: handleUpgrade,
+	}
+}
+
+func handleUpgrade(c *cli.Context) {
+	if c.String("old-version") != "1" {
+		fmt.Printf("Do not support upgrade from version %s\n", c.String("old-version"))
+		os.Exit(1)
+	}
+	if c.String("new-version") != "2" {
+		fmt.Printf("Do not support upgrade to version %s\n", c.String("new-version"))
+		os.Exit(1)
+	}
+	t, err := getTransport(c)
+	if err != nil {
+		log.Fatal(err)
+	}
+	client := http.Client{Transport: t}
+	resp, err := client.Get(c.String("peer-url") + "/v2/admin/next-internal-version")
+	if err != nil {
+		fmt.Printf("Failed to send upgrade request to %s: %v\n", c.String("peer-url"), err)
+		return
+	}
+	if resp.StatusCode == http.StatusOK {
+		fmt.Println("Cluster will start upgrading from internal version 1 to 2 in 10 seconds.")
+		return
+	}
+	if resp.StatusCode == http.StatusNotFound {
+		fmt.Println("Cluster cannot upgrade to 2: version is not 0.4.7")
+		return
+	}
+	fmt.Printf("Faild to send upgrade request to %s: bad status code %d\n", c.String("cluster-url"), resp.StatusCode)
+}
diff --git a/etcdctl/main.go b/etcdctl/main.go
index 0ccbdfcb6..083239a15 100644
--- a/etcdctl/main.go
+++ b/etcdctl/main.go
@@ -54,6 +54,7 @@ func main() {
 		command.NewWatchCommand(),
 		command.NewExecWatchCommand(),
 		command.NewMemberCommand(),
+		command.UpgradeCommand(),
 	}
 
 	app.Run(os.Args)