diff --git a/config/CONFIG.pc486 b/config/CONFIG.pc486
index 42bccf73e..bb69b281c 100644
--- a/config/CONFIG.pc486
+++ b/config/CONFIG.pc486
@@ -1,3 +1,10 @@
+<<<<<<< CONFIG.pc486
+#
+# no longer required
+#
+#SHELL=knts
+=======
+>>>>>>> 1.3
 
 # BUILD_TYPE
 #   Currently either Vx or Unix
diff --git a/config/RULES.Host b/config/RULES.Host
index edb5048c2..ecec3543e 100644
--- a/config/RULES.Host
+++ b/config/RULES.Host
@@ -407,21 +407,20 @@ endif
 	@$(RM) $@
 	$(COMPILE.cc)  $<
 
-%.c %.h: ../%.y
-	@$(RM) y.tab.c y.tab.h
+#
+# rename the y.tab.h file only if we
+# are creating it
+#
+%.h %.c: ../%.y
+	$(RM) $*.c y.tab.c
+ifeq ($(findstring -d, $(YACCOPT)),-d)
+	$(RM) $*.h y.tab.h
+endif
 	$(YACC) $(YACCOPT) $<
-	@if [ -f y.tab.c ]; \
-		then \
-			echo "$(MV) y.tab.c $*.c"; \
-			$(RM) $*.c; \
-			$(MV) y.tab.c $*.c; \
-	fi
-	@if [ -f y.tab.h ]; \
-		then \
-			echo "$(MV) y.tab.h $*.h"; \
-			$(RM) $*.h; \
-			$(MV) y.tab.h $*.h; \
-	fi
+	$(MV) y.tab.c $*.c
+ifeq ($(findstring -d, $(YACCOPT)),-d)
+	$(MV) y.tab.h $*.h
+endif
 
 %.c: ../%.l
 	@$(RM) lex.yy.c
diff --git a/config/RULES.Vx b/config/RULES.Vx
index 5270c4d7d..d9e4bade1 100644
--- a/config/RULES.Vx
+++ b/config/RULES.Vx
@@ -104,19 +104,20 @@ $(DIRECTORY_TARGETS) :
 	$(RM) $@
 	$(COMPILE.cc) $<
 
-%.c: ../%.y
-	$(RM) y.tab.c y.tab.h
+#
+# rename the y.tab.h file only if we
+# are creating it
+#
+%.h %.c: ../%.y
+	$(RM) $*.c y.tab.c
+ifeq ($(findstring -d, $(YACCOPT)),-d)
+	$(RM) $*.h y.tab.h
+endif
 	$(YACC) $(YACCOPT) $<
-	@if [ -f y.tab.c ]; \
-		then \
-			echo "$(MV) y.tab.c $*.c"; \
-			$(MV) y.tab.c $*.c; \
-	fi
-	@if [ -f y.tab.h ]; \
-		then \
-			echo "$(MV) y.tab.h $*.h"; \
-			$(MV) y.tab.h $*.h; \
-	fi
+	$(MV) y.tab.c $*.c
+ifeq ($(findstring -d, $(YACCOPT)),-d)
+	$(MV) y.tab.h $*.h
+endif
 
 %.c: ../%.l
 	$(RM) lex.yy.c