diff --git a/ChangeLog b/ChangeLog
index b052a202c..57ddea6ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,10 @@
      sizeof(state) with sizeof(*state). This worked by accident since
      the struct contained a single int at present, but could have broken
      in the future. patch from hyc AT symas.com
+   - djm@cvs.openbsd.org 2010/06/18 00:58:39
+     [sftp.c]
+     unbreak ls in working directories that contains globbing characters in
+     their pathnames. bz#1655 reported by vgiffin AT apple.com
 
 20100622
  - (djm) [loginrec.c] crank LINFO_NAMESIZE (username length) to 512
diff --git a/sftp.c b/sftp.c
index 5366c075f..229f12987 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.124 2010/05/05 04:22:09 dtucker Exp $ */
+/* $OpenBSD: sftp.c,v 1.125 2010/06/18 00:58:39 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -1368,7 +1368,7 @@ parse_dispatch_command(struct sftp_conn *conn, const char *cmd, char **pwd,
 		break;
 	case I_LS:
 		if (!path1) {
-			do_globbed_ls(conn, *pwd, *pwd, lflag);
+			do_ls_dir(conn, *pwd, *pwd, lflag);
 			break;
 		}