diff --git a/src/Makefile.in b/src/Makefile.in
index 250078bf..7c6bcf60 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,10 +1,10 @@
 # Makefile.in for REMIND
 # 
-# $Id: Makefile.in,v 1.25 2007-06-29 01:23:36 dfs Exp $
+# $Id: Makefile.in,v 1.26 2007-07-13 12:19:13 dfs Exp $
 
 VERSION=03.01.00
 SHELL= /bin/sh
-
+BETA = 1
 srcdir=@srcdir@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
@@ -80,9 +80,9 @@ distro:
 	rm -f remind-$(VERSION)
 
 beta-tgz:
-	ln -s .. remind-$(VERSION)-BETA
-	peekentry `find remind-$(VERSION)-BETA -depth -follow -name 'Entries' -print` | xargs tar cvf remind-$(VERSION)-BETA.tar
-	gzip -f -v -9 remind-$(VERSION)-BETA.tar
-	rm -f remind-$(VERSION)-BETA
+	ln -s .. remind-$(VERSION)-BETA-$(BETA)
+	peekentry `find remind-$(VERSION)-BETA-$(BETA) -depth -follow -name 'Entries' -print` | xargs tar cvf remind-$(VERSION)-BETA-$(BETA).tar
+	gzip -f -v -9 remind-$(VERSION)-BETA-$(BETA).tar
+	rm -f remind-$(VERSION)-BETA-$(BETA)
 #---------------- Stuff after this added by "make depend" -----------------
 
diff --git a/src/calendar.c b/src/calendar.c
index 0dd275e3..393e0314 100644
--- a/src/calendar.c
+++ b/src/calendar.c
@@ -11,7 +11,7 @@
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: calendar.c,v 1.22 2007-07-13 03:40:24 dfs Exp $";
+static char const RCSID[] = "$Id: calendar.c,v 1.23 2007-07-13 12:19:13 dfs Exp $";
 
 #include <stdio.h>
 #include <string.h>
@@ -663,19 +663,24 @@ static int DoCalRem(ParsePtr p, int col)
 
     /* If trigger date == today, add it to the current entry */
     DBufInit(&obuf);
-    /* Suppress time if it's not today */
-    if (jul != JulianToday) {
-	tim.ttime = NO_TIME;
-    }
     if ((jul == JulianToday) ||
 	(DoSimpleCalendar &&
 	 DoSimpleCalDelta &&
 	 ShouldTriggerReminder(&trig, &tim, jul))) {
 	NumTriggered++;
+
 	if (DoSimpleCalendar || tim.ttime != NO_TIME) {
-	    if (DBufPuts(&obuf, SimpleTime(tim.ttime)) != OK) {
-		DBufFree(&obuf);
-		return E_NO_MEM;
+	    /* Suppress time if it's not today */
+	    if (jul != JulianToday) {
+		if (DBufPuts(&obuf, SimpleTime(NO_TIME)) != OK) {
+		    DBufFree(&obuf);
+		    return E_NO_MEM;
+		}
+	    } else {
+		if (DBufPuts(&obuf, SimpleTime(tim.ttime)) != OK) {
+		    DBufFree(&obuf);
+		    return E_NO_MEM;
+		}
 	    }
 	}
 	if (trig.typ != PASSTHRU_TYPE &&
@@ -775,7 +780,11 @@ static int DoCalRem(ParsePtr p, int col)
 		e->passthru[0] = 0;
 	    }
 	    e->pos = e->text;
-	    e->time = tim.ttime;
+	    if (jul == JulianToday) {
+		e->time = tim.ttime;
+	    } else {
+		e->time = NO_TIME;
+	    }
 	    e->next = CurCol;
 	    CalColumn[col] = e;
 	    SortCol(&CalColumn[col]);