diff --git a/ChangeLog b/ChangeLog
index 91b4c10bd..28e6ac4a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,9 @@
    cjwatson@debian.org
  - (djm) Bug #460: Filling utmp[x]->ut_addr_v6 if present. Patch from 
    cjwatson@debian.org
-   
+ - (djm) Bug #446: Set LOGIN env var to pw_name on AIX. Patch from 
+   mii@ornl.gov 
+
 20030101
   - (stevesk) [session.c sshlogin.c sshlogin.h] complete portable
     parts of pass addrlen with sockaddr * fix.
@@ -923,4 +925,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2539 2003/01/03 03:42:27 djm Exp $
+$Id: ChangeLog,v 1.2540 2003/01/03 03:52:53 djm Exp $
diff --git a/session.c b/session.c
index 90d59513c..9832d7a83 100644
--- a/session.c
+++ b/session.c
@@ -969,6 +969,9 @@ do_setup_env(Session *s, const char *shell)
 		/* Set basic environment. */
 		child_set_env(&env, &envsize, "USER", pw->pw_name);
 		child_set_env(&env, &envsize, "LOGNAME", pw->pw_name);
+#ifdef _AIX
+		child_set_env(&env, &envsize, "LOGIN", pw->pw_name);
+#endif
 		child_set_env(&env, &envsize, "HOME", pw->pw_dir);
 #ifdef HAVE_LOGIN_CAP
 		if (setusercontext(lc, pw, pw->pw_uid, LOGIN_SETPATH) < 0)