diff --git a/src/toolsComm/flex/Makefile.Unix b/src/toolsComm/flex/Makefile.Unix
index 799d9233c..6f7c527ef 100644
--- a/src/toolsComm/flex/Makefile.Unix
+++ b/src/toolsComm/flex/Makefile.Unix
@@ -3,7 +3,9 @@ include Target.include
 include $(EPICS)/config/CONFIG_BASE
 
 CMPLR = OLD
-YACCOPT = -d
+YACC = $(EYACC)
+YACCOPT = -l -d
+
 SKELETON_FILE=include/flex.skel.static
 ifeq ($(T_A),hp700)
 USR_CFLAGS = -DDEFAULT_SKELETON_FILE=\"$(SKELETON_FILE)\" -DSCO_UNIX
@@ -12,13 +14,14 @@ USR_CFLAGS = -DDEFAULT_SKELETON_FILE=\"$(SKELETON_FILE)\"
 endif
 USR_LDLIBS = -s
 
-SRCS.c =  ../ccl.c ../dfa.c ../ecs.c ../gen.c ../main.c \
-	../misc.c ../nfa.c parse.c ../scan.c ../sym.c \
-	../tblcmp.c ../yylex.c
+# main.c is included in parse.c
+SRCS.c =  ../ccl.c ../dfa.c ../ecs.c ../gen.c  \
+	../misc.c ../nfa.c ../sym.c \
+	../tblcmp.c parse.c
 
 OBJS = \
-	ccl.o dfa.o ecs.o gen.o main.o misc.o \
-        nfa.o parse.o scan.o sym.o tblcmp.o yylex.o
+	ccl.o dfa.o ecs.o gen.o misc.o \
+        nfa.o sym.o tblcmp.o parse.o
 
 PROD = e_flex