diff --git a/script/post-upgrade.sh b/script/post-upgrade.sh
index e6313e6..310e26e 100644
--- a/script/post-upgrade.sh
+++ b/script/post-upgrade.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+/usr/sbin/env-update
+source /etc/profile
+
 export ACCEPT_LICENSE=*
 
 PACKAGES_TO_REMOVE=(
@@ -90,6 +93,29 @@ equo up && equo u
 equo rm --deep --configfiles --force-system "${PACKAGES_TO_REMOVE[@]}"
 equo i "${PACKAGES_TO_ADD[@]}"
 
+# Configure glibc locale, ship image with all locales enabled
+# or anaconda will crash if the user selects an unsupported one
+echo '
+# /etc/locale.gen: list all of the locales you want to have on your system
+#
+# The format of each line:
+# <locale> <charmap>
+#
+# Where <locale> is a locale located in /usr/share/i18n/locales/ and
+# where <charmap> is a charmap located in /usr/share/i18n/charmaps/.
+#
+# All blank lines and lines starting with # are ignored.
+#
+# For the default list of supported combinations, see the file:
+# /usr/share/i18n/SUPPORTED
+#
+# Whenever glibc is emerged, the locales listed here will be automatically
+# rebuilt for you.  After updating this file, you can simply run `locale-gen`
+# yourself instead of re-emerging glibc.
+' > /etc/locale.gen
+cat /usr/share/i18n/SUPPORTED >> /etc/locale.gen
+/usr/sbin/locale-gen
+
 # Configuring layman
 mkdir /etc/portage/repos.conf/
 mkdir /var/lib/layman/