diff --git a/ChangeLog b/ChangeLog
index c5b3a92b5..4981ecf4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,7 @@
      kill ssh process on receipt of signal; ok markus@
  - (djm) Update to fix of bug #584: lock card before return. 
    From larsch@trustcenter.de
+ - (djm) Always use mysignal() for SIGALRM
 
 20030603
  - (djm) Replace setproctitle replacement with code derived from 
@@ -457,4 +458,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2780 2003/06/04 12:51:38 djm Exp $
+$Id: ChangeLog,v 1.2781 2003/06/04 12:56:15 djm Exp $
diff --git a/progressmeter.c b/progressmeter.c
index 343e1b7d5..d4abf2fd9 100644
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -72,6 +72,7 @@ RCSID("$OpenBSD: progressmeter.c,v 1.6 2003/04/07 21:58:05 millert Exp $");
 
 #include "atomicio.h"
 #include "progressmeter.h"
+#include "misc.h"
 
 /* Number of seconds before xfer considered "stalled". */
 #define STALLTIME	5
@@ -121,7 +122,7 @@ start_progress_meter(char *file, off_t filesize, off_t *counter)
 	lastsize = 0;
 
 	draw_progress_meter();
-	signal(SIGALRM, update_progress_meter);
+	mysignal(SIGALRM, update_progress_meter);
 	alarm(PROGRESSTIME);
 }
 
@@ -140,7 +141,7 @@ update_progress_meter(int ignore)
 	int save_errno = errno;
 
 	draw_progress_meter();
-	signal(SIGALRM, update_progress_meter);
+	mysignal(SIGALRM, update_progress_meter);
 	alarm(PROGRESSTIME);
 	errno = save_errno;
 }
diff --git a/ssh-agent.c b/ssh-agent.c
index c179ceaa2..fbd41834e 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -962,7 +962,7 @@ check_parent_exists(int sig)
 		/* printf("Parent has died - Authentication agent exiting.\n"); */
 		cleanup_handler(sig); /* safe */
 	}
-	signal(SIGALRM, check_parent_exists);
+	mysignal(SIGALRM, check_parent_exists);
 	alarm(10);
 	errno = save_errno;
 }
@@ -1194,7 +1194,7 @@ skip:
 	fatal_add_cleanup(cleanup_socket, NULL);
 	new_socket(AUTH_SOCKET, sock);
 	if (ac > 0) {
-		signal(SIGALRM, check_parent_exists);
+		mysignal(SIGALRM, check_parent_exists);
 		alarm(10);
 	}
 	idtab_init();
diff --git a/sshd.c b/sshd.c
index bdb092016..bc458488b 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1373,7 +1373,7 @@ main(int ac, char **av)
 				if ((options.protocol & SSH_PROTO_1) &&
 				    key_used == 0) {
 					/* Schedule server key regeneration alarm. */
-					signal(SIGALRM, key_regeneration_alarm);
+					mysignal(SIGALRM, key_regeneration_alarm);
 					alarm(options.key_regeneration_time);
 					key_used = 1;
 				}
@@ -1462,7 +1462,7 @@ main(int ac, char **av)
 	 * mode; it is just annoying to have the server exit just when you
 	 * are about to discover the bug.
 	 */
-	signal(SIGALRM, grace_alarm_handler);
+	mysignal(SIGALRM, grace_alarm_handler);
 	if (!debug_flag)
 		alarm(options.login_grace_time);