diff --git a/ChangeLog b/ChangeLog
index 9b5759a8c..ce933846c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,9 @@
      [ssh-agent.c]
      check $SHELL for -k and -d, too;
      http://bugzilla.mindrot.org/show_bug.cgi?id=199
+   - markus@cvs.openbsd.org 2002/04/02 17:37:48
+     [sftp.c]
+     always call log_init()
 
 20020401
  - (stevesk) [monitor.c] PAM should work again; will *not* work with
@@ -8140,4 +8143,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.2017 2002/04/02 21:03:51 mouring Exp $
+$Id: ChangeLog,v 1.2018 2002/04/02 21:06:18 mouring Exp $
diff --git a/sftp.c b/sftp.c
index e4086549c..9a6488fa1 100644
--- a/sftp.c
+++ b/sftp.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 
-RCSID("$OpenBSD: sftp.c,v 1.28 2002/03/30 18:51:15 markus Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.29 2002/04/02 17:37:48 markus Exp $");
 
 /* XXX: short-form remote directory listings (like 'ls -C') */
 
@@ -181,6 +181,8 @@ main(int argc, char **argv)
 		}
 	}
 
+	log_init(argv[0], ll, SYSLOG_FACILITY_USER, 1);
+
 	if (sftp_direct == NULL) {
 		if (optind == argc || argc > (optind + 2))
 			usage();
@@ -210,7 +212,6 @@ main(int argc, char **argv)
 			usage();
 		}
 
-		log_init(argv[0], ll, SYSLOG_FACILITY_USER, 1);
 		addargs(&args, "-oProtocol %d", sshver);
 
 		/* no subsystem if the server-spec contains a '/' */