diff --git a/ChangeLog b/ChangeLog
index 9ca297bf6..78a23fe4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
  - (dtucker) [configure.ac ssh-keygen.c openbsd-compat/bsd-openpty.c
    openbsd-compat/daemon.c] Add includes needed by open(2).  Conditionally
    include paths.h.  Fixes build error on Solaris.
+ - (dtucker) [entropy.c] More fcntl.h, this time on AIX (and probably
+   others).
 
 20060710
  - (dtucker) [INSTALL] New autoconf version: 2.60.
@@ -4844,4 +4846,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4386 2006/07/11 08:00:06 dtucker Exp $
+$Id: ChangeLog,v 1.4387 2006/07/11 09:01:51 dtucker Exp $
diff --git a/entropy.c b/entropy.c
index d60583b34..b98e3c859 100644
--- a/entropy.c
+++ b/entropy.c
@@ -27,6 +27,14 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
+
 #include <openssl/rand.h>
 #include <openssl/crypto.h>
 #include <openssl/err.h>