diff --git a/build/common.sh b/build/common.sh
index 307c5f4261b..c83942e1e65 100755
--- a/build/common.sh
+++ b/build/common.sh
@@ -458,6 +458,7 @@ function kube::build::source_targets() {
     cmd
     docs
     examples
+    federation
     Godeps/_workspace/src
     Godeps/Godeps.json
     hack
diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
index 7d99cbc5862..0da2a2fc46d 100755
--- a/hack/lib/golang.sh
+++ b/hack/lib/golang.sh
@@ -26,6 +26,8 @@ if [ -n "${KUBERNETES_CONTRIB:-}" ]; then
 fi
 
 # The set of server targets that we are only building for Linux
+# Note: if you are adding something here, you might need to add it to
+# kube::build::source_targets in build/common.sh as well.
 kube::golang::server_targets() {
   local targets=(
     cmd/kube-proxy
@@ -34,6 +36,7 @@ kube::golang::server_targets() {
     cmd/kubelet
     cmd/kubemark
     cmd/hyperkube
+    federation/cmd/federated-apiserver
     plugin/cmd/kube-scheduler
   )
   if [ -n "${KUBERNETES_CONTRIB:-}" ]; then