diff --git a/ChangeLog b/ChangeLog
index db18b729c..a727479b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+20001223
+ - (bal) Fixed Makefile.in to support recompile of all ssh and sshd objects
+   if a change to config.h has occurred.  Suggested by Gert Doering
+   <gert@greenie.muc.de>
+ - (bal) OpenBSD CVS Update:
+   - markus@cvs.openbsd.org 2000/12/22 16:49:40
+     [ssh-keygen.c]
+     fix ssh-keygen -x -t type > file; from Roumen.Petrov@skalasoft.com
+
 20001222
  - Updated RCSID for pty.c
  - (bal) OpenBSD CVS Updates:
diff --git a/Makefile.in b/Makefile.in
index 1d8028418..117968cdc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,9 +11,7 @@ srcdir=@srcdir@
 top_srcdir=@top_srcdir@
 
 DESTDIR=
-
 VPATH=@srcdir@
-
 SSH_PROGRAM=@bindir@/ssh
 ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass
 
@@ -72,7 +70,8 @@ all: $(TARGETS) $(CONFIGFILES)
 manpages: $(MANPAGES)
 
 $(LIBSSH_OBJS): config.h
-
+$(SSHOBJS): config.h
+$(SSHDOBJS): config.h
 $(LIBOPENBSD_COMPAT_OBJS): config.h
 
 libopenbsd-compat.a: $(LIBOPENBSD_COMPAT_OBJS)
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 533cf192e..057803351 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.36 2000/12/19 23:17:58 markus Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.37 2000/12/22 16:49:40 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/pem.h>
@@ -101,8 +101,8 @@ ask_filename(struct passwd *pw, const char *prompt)
 		break;
 	}
 	snprintf(identity_file, sizeof(identity_file), "%s/%s", pw->pw_dir, name);
-	printf("%s (%s): ", prompt, identity_file);
-	fflush(stdout);
+	fprintf(stderr, "%s (%s): ", prompt, identity_file);
+	fflush(stderr);
 	if (fgets(buf, sizeof(buf), stdin) == NULL)
 		exit(1);
 	if (strchr(buf, '\n'))