diff --git a/ChangeLog b/ChangeLog
index 440c8318e..60162c088 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -161,6 +161,8 @@
    don't have libedit.
  - (dtucker) [configure.ac misc.c readconf.c servconf.c ssh-keyscan.c] Make
    RoutingDomain an unsupported option on platforms that don't have it.
+ - (dtucker) [sftp.c] Expand ifdef for libedit to cover complete_is_remote
+   too.
 
 20091226
  - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1
diff --git a/sftp.c b/sftp.c
index c994887e3..4b12fae4b 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1645,7 +1645,6 @@ complete_cmd_parse(EditLine *el, char *cmd, int lastarg, char quote,
 
 	return count;
 }
-#endif
 
 /*
  * Determine whether a particular sftp command's arguments (if any)
@@ -1666,7 +1665,6 @@ complete_is_remote(char *cmd) {
 	return -1;
 }
 
-#ifdef USE_LIBEDIT
 /* Autocomplete a filename "file" */
 static int
 complete_match(EditLine *el, struct sftp_conn *conn, char *remote_path,