diff --git a/bin/sh/mksyntax.c b/bin/sh/mksyntax.c
index 9ad405a77ddb..a4948c060c4c 100644
--- a/bin/sh/mksyntax.c
+++ b/bin/sh/mksyntax.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mksyntax.c,v 1.3 1996/08/11 22:50:59 ache Exp $
+ *	$Id: mksyntax.c,v 1.4 1996/08/12 12:31:28 ache Exp $
  */
 
 #ifndef lint
@@ -328,9 +328,9 @@ print(name)
 
 char *macro[] = {
 	"#define is_digit(c)\t((is_type+SYNBASE)[c] & ISDIGIT)",
-	"#define is_alpha(c)\t((c) != PEOF && isalpha((unsigned char) (c)))",
-	"#define is_name(c)\t((c) != PEOF && ((c) == '_' || isalpha((unsigned char) (c))))",
-	"#define is_in_name(c)\t((c) != PEOF && ((c) == '_' || isalnum((unsigned char) (c))))",
+	"#define is_alpha(c)\t((c) != PEOF && ((c) < CTLESC || (c) > CTLENDARI) && isalpha((unsigned char) (c)))",
+	"#define is_name(c)\t((c) != PEOF && ((c) < CTLESC || (c) > CTLENDARI) && ((c) == '_' || isalpha((unsigned char) (c))))",
+	"#define is_in_name(c)\t((c) != PEOF && ((c) < CTLESC || (c) > CTLENDARI) && ((c) == '_' || isalnum((unsigned char) (c))))",
 	"#define is_special(c)\t((is_type+SYNBASE)[c] & (ISSPECL|ISDIGIT))",
 	NULL
 };
diff --git a/bin/sh/var.c b/bin/sh/var.c
index 710edc7861f6..e452001852ff 100644
--- a/bin/sh/var.c
+++ b/bin/sh/var.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: var.c,v 1.3 1995/05/30 00:07:24 rgrimes Exp $
+ *	$Id: var.c,v 1.4 1996/08/11 22:51:00 ache Exp $
  */
 
 #ifndef lint
@@ -55,6 +55,7 @@ static char sccsid[] = "@(#)var.c	8.1 (Berkeley) 5/31/93";
 #include "syntax.h"
 #include "options.h"
 #include "mail.h"
+#include "parser.h"
 #include "var.h"
 #include "memalloc.h"
 #include "error.h"