diff --git a/chromeos_version.sh b/chromeos_version.sh
index 8c475c5d52..79c0403812 100755
--- a/chromeos_version.sh
+++ b/chromeos_version.sh
@@ -73,8 +73,6 @@ then
   export_version_string
   export CHROMEOS_VERSION_NAME="Chrome OS"
   export CHROMEOS_VERSION_TRACK="dev-channel"
-  # CHROMEOS_REVISION must be set in the environment for official builds
-  export CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Official Build ${CHROMEOS_REVISION:?})" 
   export CHROMEOS_VERSION_AUSERVER="https://tools.google.com/service/update2"
   export CHROMEOS_VERSION_DEVSERVER=""
 else
@@ -83,7 +81,6 @@ else
   export_version_string
   export CHROMEOS_VERSION_NAME="Chromium OS"
   export CHROMEOS_VERSION_TRACK="developer-build"
-  export CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Developer Build - $(date)-$USER)"
   HOSTNAME=$(hostname)
   export CHROMEOS_VERSION_AUSERVER="http://$HOSTNAME:8080/update"
   export CHROMEOS_VERSION_DEVSERVER="http://$HOSTNAME:8080"
@@ -92,4 +89,3 @@ fi
 # Print version info.
 echo "ChromeOS version information:"
 env | grep "^CHROMEOS_VERSION" | sed 's/^/    /'
-
diff --git a/customize_rootfs.sh b/customize_rootfs.sh
index fd76622ebb..963a28e035 100755
--- a/customize_rootfs.sh
+++ b/customize_rootfs.sh
@@ -37,6 +37,16 @@ else
   PASSWORD="gone now"
 fi
 
+# Set CHROMEOS_VERSION_DESCRIPTION here (uses vars set in chromeos_version.sh)
+# Was removed from chromeos_version.sh which can also be run outside of chroot
+# where CHROMEOS_REVISION is set
+if [ ${CHROMEOS_OFFICIAL:-0} = 1 ]
+then
+   export CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Official Build ${CHROMEOS_REVISION:?})"
+else
+   export CHROMEOS_VERSION_DESCRIPTION="${CHROMEOS_VERSION_STRING} (Developer Build - $(date)-$USER)"
+fi
+
 # Set google-specific version numbers:
 # CHROMEOS_RELEASE_CODENAME is the codename of the release.
 # CHROMEOS_RELEASE_DESCRIPTION is the version displayed by Chrome; see