diff --git a/fix-rootScopeNaming-generate-selfLink-issue-37686.patch b/fix-rootScopeNaming-generate-selfLink-issue-37686.patch
new file mode 100644
index 0000000..d39dab5
--- /dev/null
+++ b/fix-rootScopeNaming-generate-selfLink-issue-37686.patch
@@ -0,0 +1,28 @@
+From 0f3b86f1e6dc9fc9700702b140ad1304cacd63bb Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup@redhat.com>
+Date: Wed, 18 Jan 2017 08:58:03 +0100
+Subject: [PATCH] fix rootScopeNaming generate selfLink issue #37686
+
+---
+ src/k8s.io/kubernetes/pkg/apiserver/api_installer.go | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/k8s.io/kubernetes/pkg/apiserver/api_installer.go b/src/k8s.io/kubernetes/pkg/apiserver/api_installer.go
+index eaf6e23..1cd91fc 100644
+--- a/src/k8s.io/kubernetes/pkg/apiserver/api_installer.go
++++ b/src/k8s.io/kubernetes/pkg/apiserver/api_installer.go
+@@ -799,7 +799,10 @@ func (n rootScopeNaming) GenerateLink(req *restful.Request, obj runtime.Object)
+ 			return "", err
+ 		}
+ 	}
+-	return n.pathPrefix + url.QueryEscape(name) + n.pathSuffix, nil
++	if len(n.pathSuffix) == 0 {
++		return n.pathPrefix + "/" + url.QueryEscape(name), nil
++	}
++	return n.pathPrefix + "/" + url.QueryEscape(name) + "/" + n.pathSuffix, nil
+ }
+ 
+ // GenerateListLink returns the appropriate path and query to locate a list by its canonical path.
+-- 
+2.7.4
+
diff --git a/kubernetes.spec b/kubernetes.spec
index c692aeb..41af7cb 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -43,7 +43,7 @@
 
 Name:		kubernetes
 Version:	%{kube_version}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:        Container cluster management
 License:        ASL 2.0
 URL:            %{import_path}
@@ -70,6 +70,9 @@ Patch16:        fix-support-for-ppc64le.patch
 
 Patch18:        get-rid-of-the-git-commands-in-mungedocs.patch
 
+# resolves: bz1413997
+Patch19:        fix-rootScopeNaming-generate-selfLink-issue-37686.patch
+
 # It obsoletes cadvisor but needs its source code (literally integrated)
 Obsoletes:      cadvisor
 
@@ -879,6 +882,8 @@ mv $(ls | grep -v "^src$") src/k8s.io/kubernetes/.
 %patch16 -p1
 %endif
 
+%patch19 -p1
+
 %build
 pushd src/k8s.io/kubernetes/
 export KUBE_GIT_TREE_STATE="clean"
@@ -1110,6 +1115,10 @@ fi
 %systemd_postun
 
 %changelog
+* Wed Jan 18 2017 Jan Chaloupka <jchaloup@redhat.com> - 1.5.2-2
+- fix rootScopeNaming generate selfLink
+  resolves: #1413997
+
 * Fri Jan 13 2017 Jan Chaloupka <jchaloup@redhat.com> - 1.5.2-1
 - Bump version as well
   related: #1412996