diff --git a/Makefile.am b/Makefile.am
index 0d2efd1..3a9cf15 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,6 @@ EXTRA_DIST = \
 	NEWS.0 \
 	POSIX.STD \
 	README_d \
-	bisonfix.awk \
 	config.guess \
 	config.rpath  \
 	config.sub \
@@ -187,15 +186,12 @@ dist-hook:
 # or work correctly.
 
 awkgram.c: awkgram.y
-	$(YACC) $(AM_YFLAGS) $(YFLAGS) $<
-	sed 's/parse error/syntax error/g' < y.tab.c | awk -f "$(srcdir)"/bisonfix.awk awkgram > $*.c && rm y.tab.c
-	if test -f y.tab.h; then \
-	if cmp -s y.tab.h $*.h; then rm -f y.tab.h; else mv y.tab.h $*.h; fi; \
-	else :; fi
+	$(YACC) -o $@ $(AM_YFLAGS) $(YFLAGS) $<
+	sed 's/parse error/syntax error/g' < $@ > address@hidden && mv address@hidden $@
 
 command.c: command.y
-	$(YACC) -p zz $<
-	sed 's/parse error/syntax error/g' < y.tab.c | awk -f "$(srcdir)"/bisonfix.awk command > $*.c && rm y.tab.c
+	$(YACC) -o $@ -p zz $<
+	sed 's/parse error/syntax error/g' < $@ > address@hidden && mv address@hidden $@
 
 # This is for my development & testing.
 efence: gawk