diff --git a/src/ChangeLog b/src/ChangeLog
index 95c9ebf80..7bd13fc66 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-20  Pavel Roskin  <proski@gnu.org>
+
+	* background.c (background_attention): Cast pointer to long
+	instead of int because it's unsafe of 64-bit systems.
+	* main.c (init_xterm_support): Likewise.
+
 2002-02-18  Pavel Roskin  <proski@gnu.org>
 
 	* utilunix.c (canonicalize_pathname) [__QNX__]: Fix detection
diff --git a/src/background.c b/src/background.c
index 58763f934..643276ed1 100644
--- a/src/background.c
+++ b/src/background.c
@@ -285,7 +285,7 @@ background_attention (int fd, void *closure)
     }
 
     /* If the routine is zero, then the child is telling us that he is dying */
-    if ((int) routine == MSG_CHILD_EXITING){
+    if ((long) routine == MSG_CHILD_EXITING){
 	unregister_task_running (ctx->pid, fd);
 	waitpid (ctx->pid, &status, 0);
 	return 0;
diff --git a/src/main.c b/src/main.c
index 56daf091f..a328c042f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1684,7 +1684,7 @@ init_xterm_support (void)
 #endif
 
      /* -1 means invalid capability, shouldn't happen, but let's make it 0 */
-    if ((int) xmouse_seq == -1) {
+    if ((long) xmouse_seq == -1) {
 	xmouse_seq = NULL;
     }