diff --git a/ChangeLog b/ChangeLog
index ad7d46573..736ace97a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20011225
+ - (stevesk) [Makefile.in ssh-rand-helper.c]
+   portable lib and __progname support for ssh-rand-helper; ok djm@
+
 20011223
  - (bal) Removed contrib/chroot.diff and noted in contrib/README that it
    was not being maintained.
@@ -7100,4 +7104,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1707 2001/12/24 02:59:19 mouring Exp $
+$Id: ChangeLog,v 1.1708 2001/12/25 04:32:58 stevesk Exp $
diff --git a/Makefile.in b/Makefile.in
index 7a722b456..287b5ab1b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.191 2001/12/23 14:41:48 djm Exp $
+# $Id: Makefile.in,v 1.192 2001/12/25 04:32:58 stevesk Exp $
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -122,8 +122,8 @@ sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o
 sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-int.o sftp-common.o sftp-glob.o
 	$(LD) -o $@ sftp.o sftp-client.o sftp-common.o sftp-int.o sftp-glob.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
 
-ssh-rand-helper${EXEEXT}: $(LIBCOMPAT) ssh-rand-helper.o
-	$(LD) -o $@ ssh-rand-helper.o atomicio.o log.o xmalloc.o $(LDFLAGS) -lopenbsd-compat $(LIBS)
+ssh-rand-helper${EXEEXT}: $(LIBCOMPAT) libssh.a ssh-rand-helper.o
+	$(LD) -o $@ ssh-rand-helper.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
 
 # test driver for the loginrec code - not built by default
 logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o
diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c
index 5b7a9fc61..380fee46d 100644
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@@ -39,7 +39,13 @@
 #include "pathnames.h"
 #include "log.h"
 
-RCSID("$Id: ssh-rand-helper.c,v 1.1 2001/12/23 14:41:48 djm Exp $");
+#ifdef HAVE___PROGNAME
+extern char *__progname;
+#else
+char *__progname;
+#endif
+
+RCSID("$Id: ssh-rand-helper.c,v 1.2 2001/12/25 04:32:58 stevesk Exp $");
 
 #define RANDOM_SEED_SIZE 48
 
@@ -786,6 +792,7 @@ main(int argc, char **argv)
 	unsigned char buf[48];
 	int ret;
 
+	__progname = get_progname(argv[0]);
 	/* XXX: need some debugging mode */
 	log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1);