diff --git a/src/custom.h.in b/src/custom.h.in
index c4546bb5..17f6ba16 100644
--- a/src/custom.h.in
+++ b/src/custom.h.in
@@ -10,7 +10,7 @@
 /*                                                             */
 /***************************************************************/
 
-/* $Id: custom.h.in,v 1.2 1998-01-20 03:14:20 dfs Exp $ */
+/* $Id: custom.h.in,v 1.3 1998-02-10 03:33:48 dfs Exp $ */
 
 /*---------------------------------------------------------------------*/
 /* LAT_DEG, LAT_MIN and LAT_SEC: Latitude of your location             */
@@ -134,11 +134,6 @@
 /*---------------------------------------------------------------------*/
 #define MAX_PRT_LEN 40
 
-/*---------------------------------------------------------------------*/
-/* LINELEN: The maximum length of an input line                        */
-/*---------------------------------------------------------------------*/
-#define LINELEN 4096
-
 /*---------------------------------------------------------------------*/
 /* OP_STACK_SIZE: The size of the operator stack for expr. parsing     */
 /*---------------------------------------------------------------------*/
@@ -190,16 +185,6 @@
 /*---------------------------------------------------------------------*/
 #define MAX_PARTIAL_OMITS 75
 
-/*---------------------------------------------------------------------*/
-/* The size of statically-allocated buffers for tokens.                */
-/*---------------------------------------------------------------------*/
-#define TOKSIZE 1024
-
-/*---------------------------------------------------------------------*/
-/* The size of the buffer for the shell() function.                    */
-/*---------------------------------------------------------------------*/
-#define SHELLSIZE 512
-
 /*---------------------------------------------------------------------*/
 /* A newline - some systems need "\n\r"                                */
 /*---------------------------------------------------------------------*/
diff --git a/src/dosubst.c b/src/dosubst.c
index 4d991386..fc4099ce 100644
--- a/src/dosubst.c
+++ b/src/dosubst.c
@@ -11,7 +11,7 @@
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: dosubst.c,v 1.4 1998-02-10 03:15:48 dfs Exp $";
+static char const RCSID[] = "$Id: dosubst.c,v 1.5 1998-02-10 03:33:49 dfs Exp $";
 
 #define L_IN_DOSUBST
 #include <stdio.h>
@@ -78,8 +78,6 @@ int jul, mode;
 
     FromJulian(jul, &y, &m, &d);
 
-    DBufInit(dbuf);
-
     if (tim == NO_TIME) tim = curtime;
     tdiff = tim - curtime;
     adiff = ABS(tdiff);
@@ -616,7 +614,9 @@ int jul, mode;
 /* If there are NO quotes, then:  If CAL_MODE && RUN_TYPE, we don't want the
    reminder in the calendar.  Zero the output buffer and quit. */
     if (!has_quote) {
-	if (mode == CAL_MODE && t->typ == RUN_TYPE) DBufValue(dbuf) = 0;
+	if (mode == CAL_MODE && t->typ == RUN_TYPE) {
+	    *DBufValue(dbuf) = 0;
+	}
 	return OK;
     }
 
diff --git a/src/funcs.c b/src/funcs.c
index 6f5eea23..bbaa7e1e 100644
--- a/src/funcs.c
+++ b/src/funcs.c
@@ -11,7 +11,7 @@
 /***************************************************************/
 
 #include "config.h"
-static char const RCSID[] = "$Id: funcs.c,v 1.5 1998-02-10 03:15:50 dfs Exp $";
+static char const RCSID[] = "$Id: funcs.c,v 1.6 1998-02-10 03:33:49 dfs Exp $";
 
 #include <stdio.h>
 
@@ -1305,7 +1305,9 @@ static int FShell()
     int ch, r;
     FILE *fp;
 
-    int maxlen = -1;
+    /* For compatibility with previous versions of Remind, which
+       used a static buffer for reading results from shell() command */
+    int maxlen = 511;
 
     DBufInit(&buf);
     if (RunDisabled) return E_RUN_DISABLED;