diff --git a/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh b/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh
index 43a4d57156b..97388362d23 100755
--- a/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh
+++ b/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh
@@ -18,65 +18,22 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")/..
-SCRIPT_BASE=${SCRIPT_ROOT}/../..
-CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo k8s.io/code-generator)}
+SCRIPT_ROOT=$(dirname ${BASH_SOURCE})/..
+CODEGEN_PKG=${CODEGEN_PKG:-$(cd ${SCRIPT_ROOT}; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)}
 
-if LANG=C sed --help 2>&1 | grep -q GNU; then
-  SED="sed"
-elif which gsed &>/dev/null; then
-  SED="gsed"
-else
-  echo "Failed to find GNU sed as sed or gsed. If you are on Mac: brew install gnu-sed." >&2
-  exit 1
-fi
-
-# Register function to be called on EXIT to remove generated binary.
-function cleanup {
-  rm -f "${CLIENTGEN:-}"
-  rm -f "${listergen:-}"
-  rm -f "${informergen:-}"
-}
-trap cleanup EXIT
-
-echo "Building client-gen"
-CLIENTGEN="${PWD}/client-gen"
-
-go build -o "${CLIENTGEN}" ${CODEGEN_PKG}/cmd/client-gen
-
-PREFIX=k8s.io/kube-aggregator/pkg/apis
-INPUT_BASE="--input-base ${PREFIX}"
-INPUT_APIS=(
-apiregistration/
-apiregistration/v1beta1
-apiregistration/v1
-)
-INPUT="--input ${INPUT_APIS[@]}"
-CLIENTSET_PATH="--output-package k8s.io/kube-aggregator/pkg/client/clientset_generated"
-
-${CLIENTGEN} ${INPUT_BASE} ${INPUT} ${CLIENTSET_PATH} --output-base ${SCRIPT_BASE}
-${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiregistration/v1beta1,apiregistration/v1 ${CLIENTSET_PATH}  --output-base ${SCRIPT_BASE} --go-header-file ${SCRIPT_ROOT}/hack/boilerplate.go.txt
-
-
-echo "Building lister-gen"
-listergen="${PWD}/lister-gen"
-go build -o "${listergen}" ${CODEGEN_PKG}/cmd/lister-gen
-
-LISTER_INPUT="--input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration --input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1,k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
-LISTER_PATH="--output-package k8s.io/kube-aggregator/pkg/client/listers"
-${listergen} ${LISTER_INPUT} ${LISTER_PATH} --output-base ${SCRIPT_BASE} --go-header-file ${SCRIPT_ROOT}/hack/boilerplate.go.txt
-
-
-echo "Building informer-gen"
-informergen="${PWD}/informer-gen"
-go build -o "${informergen}" ${CODEGEN_PKG}/cmd/informer-gen
-
-${informergen} \
-  --output-base ${SCRIPT_BASE} \
-  --input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration --input-dirs k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1,k8s.io/kube-aggregator/pkg/apis/apiregistration/v1 \
-  --versioned-clientset-package k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset \
-  --internal-clientset-package k8s.io/kube-aggregator/pkg/client/clientset_generated/internalclientset \
-  --listers-package k8s.io/kube-aggregator/pkg/client/listers \
-  --output-package k8s.io/kube-aggregator/pkg/client/informers \
+CLIENTSET_NAME_VERSIONED=clientset \
+CLIENTSET_PKG_NAME=clientset_generated \
+${CODEGEN_PKG}/generate-groups.sh deepcopy,client,lister,informer \
+  k8s.io/kube-aggregator/pkg/client k8s.io/kube-aggregator/pkg/apis \
+  "apiregistration:v1beta1,v1" \
+  --output-base "$(dirname ${BASH_SOURCE})/../../.." \
+  --go-header-file ${SCRIPT_ROOT}/hack/boilerplate.go.txt
+
+CLIENTSET_NAME_VERSIONED=clientset \
+CLIENTSET_PKG_NAME=clientset_generated \
+CLIENTSET_NAME_INTERNAL=internalclientset \
+${CODEGEN_PKG}/generate-internal-groups.sh deepcopy,client,lister,informer,conversion \
+  k8s.io/kube-aggregator/pkg/client k8s.io/kube-aggregator/pkg/apis k8s.io/kube-aggregator/pkg/apis \
+  "apiregistration:v1beta1,v1" \
+  --output-base "$(dirname ${BASH_SOURCE})/../../.." \
   --go-header-file ${SCRIPT_ROOT}/hack/boilerplate.go.txt
-  "$@"