diff --git a/CREDITS b/CREDITS
index 67f694bcd..37160ad4c 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3,6 +3,7 @@ Tatu Ylonen <ylo@cs.hut.fi> - Creator of SSH
 Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, 
 Theo de Raadt, and Dug Song - Creators of OpenSSH
 
+Alexandre Oliva <oliva@lsd.ic.unicamp.br> - AIX fixes
 Andre Lucas <andre.lucas@dial.pipex.com> - new login code, many fixes
 Andreas Steinmetz <ast@domdv.de> - Shadow password expiry support
 Andrew McGill <andrewm@datrix.co.za> - SCO fixes
diff --git a/ChangeLog b/ChangeLog
index ba4eaa12c..9e9140d15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
  - (djm) Don't seek in directory based lastlogs
  - (djm) Fix --with-ipaddr-display configure option test. Patch from 
    Jarno Huuskonen <jhuuskon@messi.uku.fi>
+ - (djm) Fix AIX limits from Alexandre Oliva <oliva@lsd.ic.unicamp.br>
 
 20000813
  - (djm) Add $(srcdir) to includes when compiling (for VPATH). Report from
diff --git a/session.c b/session.c
index 47787e778..e68718a7e 100644
--- a/session.c
+++ b/session.c
@@ -43,12 +43,13 @@ RCSID("$OpenBSD: session.c,v 1.23 2000/07/11 08:11:33 deraadt Exp $");
 
 /* AIX limits */
 #if defined(HAVE_GETUSERATTR) && !defined(S_UFSIZE_HARD) && defined(S_UFSIZE)
-# define S_UFSIZE_HARD  S_UFSIZE
-# define S_UCPU_HARD  S_UCPU
-# define S_UDATA_HARD  S_UDATA
-# define S_USTACK_HARD  S_USTACK
-# define S_URSS_HARD  S_URSS
-# define S_UCORE_HARD  S_UCORE
+# define S_UFSIZE_HARD  S_UFSIZE "_hard"
+# define S_UCPU_HARD  S_UCPU "_hard"
+# define S_UDATA_HARD  S_UDATA "_hard"
+# define S_USTACK_HARD  S_USTACK "_hard"
+# define S_URSS_HARD  S_URSS "_hard"
+# define S_UCORE_HARD  S_UCORE "_hard"
+# define S_UNOFILE_HARD	S_UNOFILE "_hard"
 #endif
 
 /* types */