diff --git a/build/BUILD b/build/BUILD
index 5c126d4fd03..2409fcf28a1 100644
--- a/build/BUILD
+++ b/build/BUILD
@@ -15,6 +15,7 @@ filegroup(
         ":package-srcs",
         "//build/debs:all-srcs",
         "//build/release-tars:all-srcs",
+        "//build/rpms:all-srcs",
         "//build/visible_to:all-srcs",
     ],
     tags = ["automanaged"],
@@ -98,6 +99,18 @@ DOCKERIZED_BINARIES = {
     stamp = 1,
 ) for binary, meta in DOCKERIZED_BINARIES.items()]
 
+genrule(
+    name = "os_package_version",
+    outs = ["version"],
+    cmd = """
+grep ^STABLE_BUILD_SCM_REVISION bazel-out/stable-status.txt \
+    | awk '{print $$2}' \
+    | sed -e 's/^v//' -e 's/[\+-]/_/g' \
+    >$@
+""",
+    stamp = 1,
+)
+
 release_filegroup(
     name = "docker-artifacts",
     srcs = [":%s.tar" % binary for binary in DOCKERIZED_BINARIES.keys()] +
diff --git a/build/rpms/BUILD b/build/rpms/BUILD
index 1628ed68a78..bb6a8252503 100644
--- a/build/rpms/BUILD
+++ b/build/rpms/BUILD
@@ -9,7 +9,7 @@ pkg_rpm(
         "//cmd/kubectl",
     ],
     spec_file = "kubectl.spec",
-    version = "1.6.0",
+    version_file = "//build:os_package_version",
 )
 
 pkg_rpm(
@@ -20,7 +20,7 @@ pkg_rpm(
         "//cmd/kubelet",
     ],
     spec_file = "kubelet.spec",
-    version = "1.6.0",
+    version_file = "//build:os_package_version",
 )
 
 pkg_rpm(
@@ -31,7 +31,7 @@ pkg_rpm(
         "//cmd/kubeadm",
     ],
     spec_file = "kubeadm.spec",
-    version = "1.6.0",
+    version_file = "//build:os_package_version",
 )
 
 pkg_rpm(
@@ -41,5 +41,18 @@ pkg_rpm(
         "@kubernetes_cni//file",
     ],
     spec_file = "kubernetes-cni.spec",
-    version = "1.6.0",
+    version_file = "//build:os_package_version",
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
 )