diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh
index 453c3a65e023..6b4fcb5e5a50 100755
--- a/hack/test-cmd.sh
+++ b/hack/test-cmd.sh
@@ -102,7 +102,7 @@ osc get templates
 osc create -f examples/sample-app/application-template-dockerbuild.json
 osc get templates
 osc get templates ruby-helloworld-sample
-[ -n "$(osc get templates ruby-helloworld-sample -o json | osc process -f -)" ]
+osc process ruby-helloworld-sample
 osc describe templates ruby-helloworld-sample
 osc delete templates ruby-helloworld-sample
 osc get templates
diff --git a/pkg/cmd/cli/cmd/process.go b/pkg/cmd/cli/cmd/process.go
index f345edf9553d..e8d8c663cd3e 100644
--- a/pkg/cmd/cli/cmd/process.go
+++ b/pkg/cmd/cli/cmd/process.go
@@ -5,6 +5,7 @@ import (
 	"io"
 	"strings"
 
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta"
 	cmdutil "github.com/GoogleCloudPlatform/kubernetes/pkg/kubectl/cmd/util"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 	"github.com/golang/glog"
@@ -42,9 +43,12 @@ JSON and YAML formats are accepted.
 
 Examples:
 
-	# Convert template.json into resource list
+	# Convert template.json file into resource list
 	$ %[1]s process -f template.json
 
+	# Convert stored template into resource list
+	$ %[1]s process foo
+
 	# Convert template.json into resource list
 	$ cat template.json | %[1]s process -f -
 `
@@ -56,32 +60,53 @@ func NewCmdProcess(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.
 		Short: "Process template into list of resources",
 		Long:  fmt.Sprintf(processLongDesc, fullName),
 		Run: func(cmd *cobra.Command, args []string) {
-			filename := cmdutil.GetFlagString(cmd, "filename")
-			if len(filename) == 0 {
-				usageError(cmd, "Must pass a filename to update")
+			storedTemplate := ""
+			if len(args) > 0 {
+				storedTemplate = args[0]
 			}
 
-			schema, err := f.Validator(cmd)
-			checkErr(err)
+			filename := cmdutil.GetFlagString(cmd, "filename")
+			if len(storedTemplate) == 0 && len(filename) == 0 {
+				usageError(cmd, "Must pass a filename or name of stored template")
+			}
 
-			cfg, err := f.ClientConfig(cmd)
-			checkErr(err)
 			namespace, err := f.DefaultNamespace(cmd)
 			checkErr(err)
+
 			mapper, typer := f.Object(cmd)
 
-			mapping, _, _, data := cmdutil.ResourceFromFile(filename, typer, mapper, schema, cfg.Version)
-			obj, err := mapping.Codec.Decode(data)
+			client, _, err := f.Clients(cmd)
 			checkErr(err)
 
-			templateObj, ok := obj.(*api.Template)
-			if !ok {
-				checkErr(fmt.Errorf("cannot convert input to Template"))
+			var (
+				templateObj *api.Template
+				mapping     *meta.RESTMapping
+			)
+
+			if len(storedTemplate) > 0 {
+				templateObj, err = client.Templates(namespace).Get(storedTemplate)
+				version, kind, err := mapper.VersionAndKindForResource("template")
+				if mapping, err = mapper.RESTMapping(kind, version); err != nil {
+					checkErr(err)
+				}
+			} else {
+				schema, err := f.Validator(cmd)
+				checkErr(err)
+				cfg, err := f.ClientConfig(cmd)
+				checkErr(err)
+				var (
+					ok   bool
+					data []byte
+				)
+				mapping, _, _, data = cmdutil.ResourceFromFile(filename, typer, mapper, schema, cfg.Version)
+				obj, err := mapping.Codec.Decode(data)
+				checkErr(err)
+				templateObj, ok = obj.(*api.Template)
+				if !ok {
+					checkErr(fmt.Errorf("cannot convert input to Template"))
+				}
 			}
 
-			client, _, err := f.Clients(cmd)
-			checkErr(err)
-
 			if cmd.Flag("value").Changed {
 				injectUserVars(cmd, templateObj)
 			}