diff --git a/configure/Makefile b/configure/Makefile
index 333b801d6..86c59048e 100644
--- a/configure/Makefile
+++ b/configure/Makefile
@@ -1,10 +1,9 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2002 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
+# EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 #
@@ -24,7 +23,5 @@ CONFIGS += $(subst ../,,$(wildcard ../os/CONFIG*))
 CONFIGS += $(subst ../,,$(wildcard ../RELEASE*))
 CONFIGS += $(subst ../,,$(wildcard ../RULES*))
 
-CONFIGS += $(subst ../,,$(wildcard ../tools/*.pl))
-
 include $(TOP)/configure/RULES
 
diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD
index c37b4804d..645709aae 100644
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -10,7 +10,7 @@
 #
 #	Rules for making things specified in Makefile
 #
-#	we are in O.$(OS_CLASS), but most sources are one dir above:
+#	we are in O.$(T_A), but most sources are elsewhere
 #
 
 ifndef BASE_RULES_BUILD
@@ -19,13 +19,12 @@ BASE_RULES_BUILD=1
 vpath %.c $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.cc $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.cpp $(USR_VPATH) $(ALL_SRC_DIRS)
-vpath %.C $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.rc $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.h $(USR_VPATH) $(ALL_SRC_DIRS)
-vpath %.H $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.skel.static $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.y $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.l $(USR_VPATH) $(ALL_SRC_DIRS)
+vpath %.pl $(USR_VPATH) $(ALL_SRC_DIRS)
 
 #---------------------------------------------------------------
 
diff --git a/src/ioc/registry/Makefile b/src/ioc/registry/Makefile
index e5ed28cf3..c43fb36a7 100644
--- a/src/ioc/registry/Makefile
+++ b/src/ioc/registry/Makefile
@@ -18,7 +18,7 @@ INC += registryFunction.h
 INC += registryCommon.h
 INC += registryIocRegister.h
 
-SCRIPTS_HOST += registry/registerRecordDeviceDriver.pl
+SCRIPTS_HOST += registerRecordDeviceDriver.pl
 
 dbCore_SRCS += registryRecordType.c
 dbCore_SRCS += registryDeviceSupport.c