diff --git a/ChangeLog b/ChangeLog
index 5cad5f1d..03ca8c84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,8 @@ v0.37.5		12-Jul-2003
 	mbtask:
 		On new installations sets max logins to 1.
 		Now uses standard locking in ~/var/run
+		When idle, it now reports the time to the next event to be
+		seen in mbmon menu 1.
 
 	mbmon:
 		Added program locking, only one mbmon can run at the same time
diff --git a/TODO b/TODO
index 1ce7d184..74854799 100644
--- a/TODO
+++ b/TODO
@@ -14,6 +14,12 @@ $Id$
                  L = Cosmetic or nice to have.
 		 X = Will not be done unless it's really needed.
 
+everything:
+	L: Finish big-endian machines porting (low priority because it seems
+	   that I'm the only one using Sun's and HP-PA systems next to Intel).
+
+	L: Implement IPv6.
+
 install:
 	N: On some (unsupported) distro's with xinetd the installation script
 	   also adds entries to inetd.conf.
diff --git a/mbtask/mbtask.c b/mbtask/mbtask.c
index 6b175064..e52dafac 100644
--- a/mbtask/mbtask.c
+++ b/mbtask/mbtask.c
@@ -60,6 +60,7 @@ int			sock = -1;		/* Datagram socket	*/
 struct sockaddr_un	servaddr;		/* Server address	*/
 struct sockaddr_un	from;			/* From address		*/
 int			fromlen;
+char			waitmsg[81];		/* Waiting message	*/
 static char		spath[PATH_MAX];	/* Socket path		*/
 int			logtrans = 0;		/* Log transactions	*/
 struct taskrec		TCFG;			/* Task config record	*/
@@ -1011,7 +1012,7 @@ void scheduler(void)
 	else if (!s_bbsopen)
 	    sprintf(doing, "BBS is closed");
 	else if (Processing)
-	    sprintf(doing, "Waiting (%d)", oldmin);
+	    sprintf(doing, "%s", waitmsg);
 	else
 	    sprintf(doing, "Overload %2.2f", Load);
 
diff --git a/mbtask/outstat.c b/mbtask/outstat.c
index 256dcce7..b33d0ba6 100644
--- a/mbtask/outstat.c
+++ b/mbtask/outstat.c
@@ -54,6 +54,7 @@ extern int		s_do_inet;	    /* Internet wanted		*/
 extern int		pots_lines;	    /* POTS lines available	*/
 extern int		isdn_lines;	    /* ISDN lines available	*/
 extern pp_list		*pl;		    /* Available ports		*/
+extern char		waitmsg[];	    /* Waiting message		*/
 
 
 
@@ -581,6 +582,7 @@ int outstat()
     /*
      * Log results
      */
+    sprintf(waitmsg, "Next event at %02d:%02d UTC", nxt_hour, nxt_min);
     Syslog('+', "Systems to call: Inet=%d, ISDN=%d, POTS=%d, Next event at %02d:%02d UTC", 
 	    inet_calls, isdn_calls, pots_calls, nxt_hour, nxt_min);
     free(temp);