diff --git a/debian/changelog b/debian/changelog
index eb81c12..4260bb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@
 
   * set-datetime: Make timesyncd behave in the face of broken time
   * ssh: Disable password authentication
+  * profile: Set the LANG var based upon /etc/locale.conf if LANG is unset.
 
  -- Coral <coral-support@google.com>  Tue, 26 Feb 2019 11:32:18 -0800
 
diff --git a/etc/profile.d/default-lang.sh b/etc/profile.d/default-lang.sh
new file mode 100644
index 0000000..e2a6035
--- /dev/null
+++ b/etc/profile.d/default-lang.sh
@@ -0,0 +1,5 @@
+# Set the default LANG to something sensible if it is unset
+if [ -z "$LANG" ]; then
+    source /etc/locale.conf
+    export LANG
+fi