diff --git a/cmd/gendeepcopy/deep_copy.go b/cmd/gendeepcopy/deep_copy.go
index fb7fa12f5ff..7c10aa9fd5c 100644
--- a/cmd/gendeepcopy/deep_copy.go
+++ b/cmd/gendeepcopy/deep_copy.go
@@ -17,6 +17,8 @@ limitations under the License.
 package main
 
 import (
+	"bytes"
+	"fmt"
 	"io"
 	"os"
 	"path"
@@ -32,6 +34,7 @@ import (
 
 	"github.com/golang/glog"
 	flag "github.com/spf13/pflag"
+	"golang.org/x/tools/imports"
 )
 
 const pkgBase = "k8s.io/kubernetes/pkg"
@@ -58,12 +61,24 @@ func main() {
 		funcOut = file
 	}
 
+	data := new(bytes.Buffer)
+
 	group, version := path.Split(*groupVersion)
 	group = strings.TrimRight(group, "/")
 	registerTo := "api.Scheme"
 	if *groupVersion == "api/" {
 		registerTo = "Scheme"
 	}
+	pkgname := group
+	if len(version) != 0 {
+		pkgname = version
+	}
+
+	_, err := data.WriteString(fmt.Sprintf("package %s\n", pkgname))
+	if err != nil {
+		glog.Fatalf("error writing package line: %v", err)
+	}
+
 	versionPath := path.Join(pkgBase, group, version)
 	generator := pkg_runtime.NewDeepCopyGenerator(api.Scheme.Raw(), versionPath, util.NewStringSet("k8s.io/kubernetes"))
 	generator.AddImport(path.Join(pkgBase, "api"))
@@ -86,13 +101,20 @@ func main() {
 		}
 	}
 	generator.RepackImports()
-	if err := generator.WriteImports(funcOut); err != nil {
+	if err := generator.WriteImports(data); err != nil {
 		glog.Fatalf("error while writing imports: %v", err)
 	}
-	if err := generator.WriteDeepCopyFunctions(funcOut); err != nil {
+	if err := generator.WriteDeepCopyFunctions(data); err != nil {
 		glog.Fatalf("error while writing deep copy functions: %v", err)
 	}
-	if err := generator.RegisterDeepCopyFunctions(funcOut, registerTo); err != nil {
+	if err := generator.RegisterDeepCopyFunctions(data, registerTo); err != nil {
 		glog.Fatalf("error while registering deep copy functions: %v", err)
 	}
+	b, err := imports.Process("", data.Bytes(), nil)
+	if err != nil {
+		glog.Fatalf("error while update imports: %v", err)
+	}
+	if _, err := funcOut.Write(b); err != nil {
+		glog.Fatalf("error while writing out the resulting file: %v", err)
+	}
 }
diff --git a/hack/after-build/update-generated-deep-copies.sh b/hack/after-build/update-generated-deep-copies.sh
index acb53d2da35..9046c70ead1 100755
--- a/hack/after-build/update-generated-deep-copies.sh
+++ b/hack/after-build/update-generated-deep-copies.sh
@@ -36,27 +36,14 @@ function generate_version() {
 
 	echo "Generating for ${version}"
 
-	# version is group/version, so use the version number as the package name unless
-	# this is an internal version, in which case use the group name. 
-	pkgname=${version##*/}
-	if [[ -z $pkgname ]]; then
-		pkgname=${version%/*}
-	fi
-
 	sed 's/YEAR/2015/' hack/boilerplate/boilerplate.go.txt > $TMPFILE
 	cat >> $TMPFILE <<EOF
-package $pkgname
+// DO NOT EDIT. THIS FILE IS AUTO-GENERATED BY \$KUBEROOT/hack/update-generated-deep-copies.sh.
 
-// AUTO-GENERATED FUNCTIONS START HERE
 EOF
 
 	"${gendeepcopy}" -v "${version}" -f - -o "${version}=" >>  "$TMPFILE"
 
-	cat >> "$TMPFILE" <<EOF
-// AUTO-GENERATED FUNCTIONS END HERE
-EOF
-
-	goimports -w "$TMPFILE"
 	mv "$TMPFILE" `result_file_name ${version}`
 }
 
diff --git a/pkg/api/deep_copy_generated.go b/pkg/api/deep_copy_generated.go
index 9898e2dc70e..207ad0c7d36 100644
--- a/pkg/api/deep_copy_generated.go
+++ b/pkg/api/deep_copy_generated.go
@@ -14,9 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// DO NOT EDIT. THIS FILE IS AUTO-GENERATED BY $KUBEROOT/hack/update-generated-deep-copies.sh.
+
 package api
 
-// AUTO-GENERATED FUNCTIONS START HERE
 import (
 	time "time"
 
@@ -2289,5 +2290,3 @@ func init() {
 		panic(err)
 	}
 }
-
-// AUTO-GENERATED FUNCTIONS END HERE
diff --git a/pkg/api/v1/deep_copy_generated.go b/pkg/api/v1/deep_copy_generated.go
index 2d6f64c6ae9..7ff906a19f0 100644
--- a/pkg/api/v1/deep_copy_generated.go
+++ b/pkg/api/v1/deep_copy_generated.go
@@ -14,9 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// DO NOT EDIT. THIS FILE IS AUTO-GENERATED BY $KUBEROOT/hack/update-generated-deep-copies.sh.
+
 package v1
 
-// AUTO-GENERATED FUNCTIONS START HERE
 import (
 	time "time"
 
@@ -2291,5 +2292,3 @@ func init() {
 		panic(err)
 	}
 }
-
-// AUTO-GENERATED FUNCTIONS END HERE
diff --git a/pkg/expapi/deep_copy_generated.go b/pkg/expapi/deep_copy_generated.go
index f310ff9f75e..0ebee13fc50 100644
--- a/pkg/expapi/deep_copy_generated.go
+++ b/pkg/expapi/deep_copy_generated.go
@@ -14,9 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// DO NOT EDIT. THIS FILE IS AUTO-GENERATED BY $KUBEROOT/hack/update-generated-deep-copies.sh.
+
 package expapi
 
-// AUTO-GENERATED FUNCTIONS START HERE
 import (
 	time "time"
 
@@ -232,5 +233,3 @@ func init() {
 		panic(err)
 	}
 }
-
-// AUTO-GENERATED FUNCTIONS END HERE
diff --git a/pkg/expapi/v1/deep_copy_generated.go b/pkg/expapi/v1/deep_copy_generated.go
index eeb72899169..2543a796d95 100644
--- a/pkg/expapi/v1/deep_copy_generated.go
+++ b/pkg/expapi/v1/deep_copy_generated.go
@@ -14,9 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// DO NOT EDIT. THIS FILE IS AUTO-GENERATED BY $KUBEROOT/hack/update-generated-deep-copies.sh.
+
 package v1
 
-// AUTO-GENERATED FUNCTIONS START HERE
 import (
 	time "time"
 
@@ -233,5 +234,3 @@ func init() {
 		panic(err)
 	}
 }
-
-// AUTO-GENERATED FUNCTIONS END HERE