3 files changed, 10 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 546a0c4f2..a9c7327de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ openssh (1:3.9p1-1) UNRELEASED; urgency=low
   * New upstream release.
     - PAM password authentication implemented again (closes: #238699,
       #242119).
+    - Implemented the ability to pass selected environment variables between
+      the client and the server.
+  * Pass LANG and LC_* environment variables from the client by default, and
+    accept them to the server by default in new installs, although not on
+    upgrade (closes: #264024).
   * Build ssh in binary-indep, not binary-arch (thanks, LaMont Jones).
 
  -- Colin Watson <cjwatson@debian.org>  Wed,  1 Dec 2004 16:23:23 +0000
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
index 1da6cdfc5..15e43f1a4 100644
--- a/debian/openssh-server.postinst
+++ b/debian/openssh-server.postinst
@@ -256,6 +256,9 @@ KeepAlive yes
 #MaxStartups 10:30:60
 #Banner /etc/issue.net
 
+# Allow client to pass locale environment variables
+AcceptEnv LANG LC_*
+
 Subsystem       sftp    /usr/lib/sftp-server
 
 UsePAM yes
diff --git a/ssh_config b/ssh_config
index f72394b4e..f3e1e8b04 100644
--- a/ssh_config
+++ b/ssh_config
@@ -15,7 +15,7 @@
 
 # Site-wide defaults for various options
 
-# Host *
+Host *
 #   ForwardAgent no
 #   ForwardX11 no
 #   ForwardX11Trusted yes
@@ -36,3 +36,4 @@
 #   Cipher 3des
 #   Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
 #   EscapeChar ~
+    SendEnv LANG LC_ALL