diff --git a/kubernetes.spec b/kubernetes.spec
index 4a1b055..59d5008 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -61,7 +61,7 @@
 
 Name:		kubernetes
 Version:	%{kube_version}
-Release:	0.10.alpha6.git%{k8s_shortcommit}%{?dist}
+Release:	0.11.alpha6.git%{k8s_shortcommit}%{?dist}
 Summary:        Container cluster management
 License:        ASL 2.0
 URL:            %{import_path}
@@ -85,7 +85,8 @@ Patch10:        keep-solid-port-for-kube-proxy.patch
 Patch11:        github.com-fsouza-go-dockerclient-fix-docker-client.patch
 
 # Drop apiserver command from hyperkube as apiserver has different permisions and capabilities
-Patch12:        un-hyperkube-apiserver.patch
+# Add kube-prefix for controller-manager, proxy and scheduler
+Patch12:        remove-apiserver-add-kube-prefix-for-hyperkube.patch
 
 # It obsoletes cadvisor but needs its source code (literally integrated)
 Obsoletes:      cadvisor
@@ -817,6 +818,9 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
 %systemd_postun
 
 %changelog
+* Fri Feb 26 2016 jchaloup <jchaloup@redhat.com> - 1.2.0-0.11.alpha6.gitf0cd09a
+- add kube- prefix to controller-manager, proxy and scheduler
+
 * Fri Feb 26 2016 jchaloup <jchaloup@redhat.com> - 1.2.0-0.10.alpha6.gitf0cd09a
 - Hardlink kube-controller-manager, kuber-scheduler, kubectl, kubelet and kube-proxy into hyperkube
 - Keep kube-apiserver binary as it is (it has different permission and capabilities)
diff --git a/remove-apiserver-add-kube-prefix-for-hyperkube.patch b/remove-apiserver-add-kube-prefix-for-hyperkube.patch
new file mode 100644
index 0000000..c498f0d
--- /dev/null
+++ b/remove-apiserver-add-kube-prefix-for-hyperkube.patch
@@ -0,0 +1,66 @@
+From f8748053d34c651230fbc317e25d74d404548c66 Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup@redhat.com>
+Date: Fri, 26 Feb 2016 16:17:24 +0100
+Subject: [PATCH] remove apiserver, add kube-prefix for hyperkube
+
+---
+ cmd/hyperkube/kube-controller-manager.go | 2 +-
+ cmd/hyperkube/kube-proxy.go              | 2 +-
+ cmd/hyperkube/kube-scheduler.go          | 2 +-
+ cmd/hyperkube/main.go                    | 1 -
+ 4 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/cmd/hyperkube/kube-controller-manager.go b/cmd/hyperkube/kube-controller-manager.go
+index 57d4856..1fc5107 100644
+--- a/cmd/hyperkube/kube-controller-manager.go
++++ b/cmd/hyperkube/kube-controller-manager.go
+@@ -29,7 +29,7 @@ func NewKubeControllerManager() *Server {
+ 	s := options.NewCMServer()
+ 
+ 	hks := Server{
+-		SimpleUsage: "controller-manager",
++		SimpleUsage: "kube-controller-manager",
+ 		Long:        "A server that runs a set of active components. This includes replication controllers, service endpoints and nodes.",
+ 		Run: func(_ *Server, args []string) error {
+ 			return app.Run(s)
+diff --git a/cmd/hyperkube/kube-proxy.go b/cmd/hyperkube/kube-proxy.go
+index 2f8678d..0a010d8 100644
+--- a/cmd/hyperkube/kube-proxy.go
++++ b/cmd/hyperkube/kube-proxy.go
+@@ -29,7 +29,7 @@ func NewKubeProxy() *Server {
+ 	config := options.NewProxyConfig()
+ 
+ 	hks := Server{
+-		SimpleUsage: "proxy",
++		SimpleUsage: "kube-proxy",
+ 		Long: `The Kubernetes proxy server is responsible for taking traffic directed at
+ 		services and forwarding it to the appropriate pods. It generally runs on
+ 		nodes next to the Kubelet and proxies traffic from local pods to remote pods.
+diff --git a/cmd/hyperkube/kube-scheduler.go b/cmd/hyperkube/kube-scheduler.go
+index 799038d..4be08e1 100644
+--- a/cmd/hyperkube/kube-scheduler.go
++++ b/cmd/hyperkube/kube-scheduler.go
+@@ -29,7 +29,7 @@ func NewScheduler() *Server {
+ 	s := options.NewSchedulerServer()
+ 
+ 	hks := Server{
+-		SimpleUsage: "scheduler",
++		SimpleUsage: "kube-scheduler",
+ 		Long:        "Implements a Kubernetes scheduler.  This will assign pods to kubelets based on capacity and constraints.",
+ 		Run: func(_ *Server, _ []string) error {
+ 			return app.Run(s)
+diff --git a/cmd/hyperkube/main.go b/cmd/hyperkube/main.go
+index 4d9c499..8b060ba 100644
+--- a/cmd/hyperkube/main.go
++++ b/cmd/hyperkube/main.go
+@@ -32,7 +32,6 @@ func main() {
+ 	}
+ 
+ 	hk.AddServer(NewKubectlServer())
+-	hk.AddServer(NewKubeAPIServer())
+ 	hk.AddServer(NewKubeControllerManager())
+ 	hk.AddServer(NewScheduler())
+ 	hk.AddServer(NewKubelet())
+-- 
+1.9.3
+
diff --git a/un-hyperkube-apiserver.patch b/un-hyperkube-apiserver.patch
deleted file mode 100644
index ee4750b..0000000
--- a/un-hyperkube-apiserver.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5e6b6dcc870a7af2ca846596c1edac8fd525ce35 Mon Sep 17 00:00:00 2001
-From: Jan Chaloupka <jchaloup@redhat.com>
-Date: Fri, 26 Feb 2016 09:55:47 +0100
-Subject: [PATCH] un hyperkube apiserver
-
----
- cmd/hyperkube/main.go | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/cmd/hyperkube/main.go b/cmd/hyperkube/main.go
-index 4d9c499..8b060ba 100644
---- a/cmd/hyperkube/main.go
-+++ b/cmd/hyperkube/main.go
-@@ -32,7 +32,6 @@ func main() {
- 	}
- 
- 	hk.AddServer(NewKubectlServer())
--	hk.AddServer(NewKubeAPIServer())
- 	hk.AddServer(NewKubeControllerManager())
- 	hk.AddServer(NewScheduler())
- 	hk.AddServer(NewKubelet())
--- 
-1.9.3
-