diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r61.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r62.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r61.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r62.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild
index 6231f02418..8596dc24ca 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild
@@ -125,6 +125,9 @@ src_install() {
 		# Insert empty fstab
 		doins "${FILESDIR}"/fstab
 
+		# Insert glibc's nsswitch.conf since that is installed weirdly
+		doins "${FILESDIR}"/nsswitch.conf
+
 		# Symlink /etc/localtime to something on the stateful partition, which we
 		# can then change around at runtime.
 		dosym /var/lib/timezone/localtime /etc/localtime || die
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/nsswitch.conf b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/nsswitch.conf
new file mode 100644
index 0000000000..4259b8a468
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/files/nsswitch.conf
@@ -0,0 +1,24 @@
+# /etc/nsswitch.conf:
+# $Header: /var/cvsroot/gentoo/src/patchsets/glibc/extra/etc/nsswitch.conf,v 1.1 2006/09/29 23:52:23 vapier Exp $
+
+passwd:      compat
+shadow:      compat
+group:       compat
+
+# passwd:    db files nis
+# shadow:    db files nis
+# group:     db files nis
+
+hosts:       files dns
+networks:    files dns
+
+services:    db files
+protocols:   db files
+rpc:         db files
+ethers:      db files
+netmasks:    files
+netgroup:    files
+bootparams:  files
+
+automount:   files
+aliases:     files