diff --git a/fix-support-for-ppc64le.patch b/fix-support-for-ppc64le.patch
index 6e43275..fbaab44 100644
--- a/fix-support-for-ppc64le.patch
+++ b/fix-support-for-ppc64le.patch
@@ -1,12 +1,13 @@
-From 8e2484a6565ba7237156539ff679909fc1c9c44b Mon Sep 17 00:00:00 2001
+From a6a2f155a96ba2c38ebd5caac78b37871a8db923 Mon Sep 17 00:00:00 2001
 From: Jan Chaloupka <jchaloup@redhat.com>
-Date: Tue, 8 Nov 2016 14:12:48 +0100
+Date: Wed, 4 Jan 2017 22:16:08 +0100
 Subject: [PATCH] fix support for ppc64le
 
 ---
  Makefile         | 2 +-
  hack/lib/init.sh | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ hack/lib/util.sh | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/Makefile b/Makefile
 index ac10e76..93ca680 100644
@@ -22,7 +23,7 @@ index ac10e76..93ca680 100644
  GENERATED_FILE_PREFIX := zz_generated.
  
 diff --git a/hack/lib/init.sh b/hack/lib/init.sh
-index d2b50d4..dfb4727 100644
+index aa01fc1..5dfc1f1 100644
 --- a/hack/lib/init.sh
 +++ b/hack/lib/init.sh
 @@ -23,7 +23,7 @@ KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE}")/../.." && pwd -P)"
@@ -34,6 +35,19 @@ index d2b50d4..dfb4727 100644
  
  # Set no_proxy for localhost if behind a proxy, otherwise, 
  # the connections to localhost in scripts will time out
+diff --git a/hack/lib/util.sh b/hack/lib/util.sh
+index 549f6f0..c18e6e7 100755
+--- a/hack/lib/util.sh
++++ b/hack/lib/util.sh
+@@ -168,7 +168,7 @@ kube::util::find-binary() {
+   local lookfor="${1}"
+   local host_platform="$(kube::util::host_platform)"
+   local locations=(
+-    "${KUBE_ROOT}/_output/bin/${lookfor}"
++    "${KUBE_ROOT}/_output/local/go/bin/${lookfor}"
+     "${KUBE_ROOT}/_output/dockerized/bin/${host_platform}/${lookfor}"
+     "${KUBE_ROOT}/_output/local/bin/${host_platform}/${lookfor}"
+     "${KUBE_ROOT}/platforms/${host_platform}/${lookfor}"
 -- 
-1.9.3
+2.7.4
 
diff --git a/get-rid-of-the-git-commands-in-mungedocs.patch b/get-rid-of-the-git-commands-in-mungedocs.patch
new file mode 100644
index 0000000..0900912
--- /dev/null
+++ b/get-rid-of-the-git-commands-in-mungedocs.patch
@@ -0,0 +1,45 @@
+From b9bbf8481ef5a2150093279ab8dde7174b58743c Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup@redhat.com>
+Date: Wed, 4 Jan 2017 17:15:52 +0100
+Subject: [PATCH] get rid of the git commands in mungedocs
+
+---
+ src/k8s.io/kubernetes/cmd/mungedocs/mungedocs.go | 7 +------
+ src/k8s.io/kubernetes/hack/update-munge-docs.sh  | 2 +-
+ 2 files changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/src/k8s.io/kubernetes/cmd/mungedocs/mungedocs.go b/src/k8s.io/kubernetes/cmd/mungedocs/mungedocs.go
+index 628ca55..83034b4 100644
+--- a/src/k8s.io/kubernetes/cmd/mungedocs/mungedocs.go
++++ b/src/k8s.io/kubernetes/cmd/mungedocs/mungedocs.go
+@@ -217,13 +217,8 @@ func main() {
+ 		os.Exit(2)
+ 	}
+ 
+-	absRootDir, err := filepath.Abs(*rootDir)
+-	if err != nil {
+-		fmt.Fprintf(os.Stderr, "ERROR: %v\n", err)
+-		os.Exit(2)
+-	}
+ 	inJenkins = len(os.Getenv("JENKINS_HOME")) != 0
+-	out, err := exec.Command("git", "ls-tree", "-r", "--name-only", fmt.Sprintf("%s/%s", *upstream, latestReleaseBranch), absRootDir).CombinedOutput()
++	out, err := exec.Command("tree", "-f", "-i").CombinedOutput()
+ 	if err != nil {
+ 		if inJenkins {
+ 			fmt.Fprintf(os.Stderr, "output: %s,\nERROR: %v\n", out, err)
+diff --git a/src/k8s.io/kubernetes/hack/update-munge-docs.sh b/src/k8s.io/kubernetes/hack/update-munge-docs.sh
+index 1bc71c6..493954a 100755
+--- a/src/k8s.io/kubernetes/hack/update-munge-docs.sh
++++ b/src/k8s.io/kubernetes/hack/update-munge-docs.sh
+@@ -21,7 +21,7 @@ set -o pipefail
+ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
+ source "${KUBE_ROOT}/hack/lib/init.sh"
+ 
+-git_upstream=$(kube::util::git_upstream_remote_name)
++git_upstream=origin
+ : ${git_upstream:="upstream"}
+ 
+ kube::golang::setup_env
+-- 
+2.7.4
+
diff --git a/kubernetes.spec b/kubernetes.spec
index c44a3c9..723b125 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}
@@ -68,9 +68,13 @@ Patch17:        Hyperkube-remove-federation-cmds.patch
 # ppc64le
 Patch16:        fix-support-for-ppc64le.patch
 
+Patch18:        get-rid-of-the-git-commands-in-mungedocs.patch
+
 # It obsoletes cadvisor but needs its source code (literally integrated)
 Obsoletes:      cadvisor
 
+BuildRequires:  tree
+
 # kubernetes is decomposed into master and node subpackages
 # require both of them for updates
 Requires: kubernetes-master = %{version}-%{release}
@@ -874,6 +878,8 @@ mv $(ls | grep -v "^src$") src/k8s.io/kubernetes/.
 %patch4 -p1
 %patch5 -p1
 
+%patch18 -p1
+
 %build
 pushd src/k8s.io/kubernetes/
 export KUBE_GIT_TREE_STATE="clean"
@@ -888,6 +894,7 @@ export GOLDFLAGS='-linkmode=external'
 make WHAT="--use_go_build cmd/hyperkube cmd/kube-apiserver"
 
 # convert md to man
+./hack/generate-docs.sh
 pushd docs
 pushd admin
 cp kube-apiserver.md kube-controller-manager.md kube-proxy.md kube-scheduler.md kubelet.md ..
@@ -1104,6 +1111,10 @@ fi
 %systemd_postun
 
 %changelog
+* Wed Jan 04 2017 Jan Chaloupka <jchaloup@redhat.com> - 1.4.7-2
+- Generate the md files before they are converted to man pages
+  resolves: #1409943
+
 * Mon Dec 12 2016 Jan Chaloupka <jchaloup@redhat.com> - 1.4.7-1
 - Bump to upstream v1.4.7
   resolves: #1403823