diff --git a/ChangeLog b/ChangeLog
index 22a17bca8..a274ce3ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,8 @@
  - (dtucker) [openbsd-compat/glob.c] Update from OpenBSD 1.22 -> 1.25.
  - (dtucker) [openbsd-compat/glob.h] Update from OpenBSD 1.8 -> 1.9.
  - (dtucker) [openbsd-compat/getcwd.c] Update from OpenBSD 1.9 -> 1.14.
+ - (dtucker) [openbsd-compat/getcwd.c] Replace lstat with fstat to match up
+   with OpenBSD code since we don't support platforms without fstat any more.
 
 20051105
  - (djm) OpenBSD CVS Sync
@@ -3272,4 +3274,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.3973 2005/11/10 06:11:29 dtucker Exp $
+$Id: ChangeLog,v 1.3974 2005/11/10 06:15:06 dtucker Exp $
diff --git a/openbsd-compat/getcwd.c b/openbsd-compat/getcwd.c
index 9354f7ae4..711cb9cd5 100644
--- a/openbsd-compat/getcwd.c
+++ b/openbsd-compat/getcwd.c
@@ -144,10 +144,8 @@ getcwd(char *pt, size_t size)
 		*bup++ = '.';
 		*bup = '\0';
 
-		/* Open and stat parent directory. 
-		 * RACE?? - replaced fstat(dirfd(dir), &s) w/ lstat(up,&s) 
-                 */
-		if (!(dir = opendir(up)) || lstat(up,&s))
+		/* Open and stat parent directory. */
+		if (!(dir = opendir(up)) || fstat(dirfd(dir), &s))
 			goto err;
 
 		/* Add trailing slash for next directory. */