diff --git a/ChangeLog b/ChangeLog
index 1159bc563..d14f04ae9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,9 @@
    - markus@cvs.openbsd.org 2002/04/01 22:02:16
      [sftp-client.c]
      20480 is an upper limit for older server
+   - markus@cvs.openbsd.org 2002/04/01 22:07:17
+     [sftp-client.c]
+     fallback to stat if server does not support lstat
 
 20020401
  - (stevesk) [monitor.c] PAM should work again; will *not* work with
@@ -8133,4 +8136,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.2015 2002/04/02 20:58:11 mouring Exp $
+$Id: ChangeLog,v 1.2016 2002/04/02 21:00:31 mouring Exp $
diff --git a/sftp-client.c b/sftp-client.c
index 98ed2ba00..254ef6f70 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -28,7 +28,7 @@
 /* XXX: copy between two remote sites */
 
 #include "includes.h"
-RCSID("$OpenBSD: sftp-client.c,v 1.29 2002/04/01 22:02:16 markus Exp $");
+RCSID("$OpenBSD: sftp-client.c,v 1.30 2002/04/01 22:07:17 markus Exp $");
 
 #if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H)
 #include <sys/queue.h>
@@ -512,8 +512,8 @@ do_lstat(struct sftp_conn *conn, char *path, int quiet)
 		if (quiet)
 			debug("Server version does not support lstat operation");
 		else
-			error("Server version does not support lstat operation");
-		return(NULL);
+			log("Server version does not support lstat operation");
+		return(do_stat(conn, path, quiet));
 	}
 
 	id = conn->msg_id++;