diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index 751bd8b8fdc6..bf33e718fd4c 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -4,9 +4,9 @@
 
 PROG=	make
 CFLAGS+=-I${.CURDIR}
-SRCS=	arch.c buf.c compat.c cond.c dir.c directive_hash.c for.c	\
-	hash.c job.c lst.c main.c make.c parse.c str.c suff.c targ.c	\
-	util.c var.c var_modify.c
+SRCS=	arch.c buf.c compat.c cond.c dir.c for.c hash.c hash_tables.c	\
+	job.c lst.c main.c make.c parse.c str.c suff.c targ.c util.c	\
+	var.c var_modify.c
 
 NO_WERROR=
 WARNS?=	3
@@ -56,7 +56,7 @@ hash:
 	  echo ' */' ;							\
 	  echo '#include <sys/types.h>' ;				\
 	  echo ;							\
-	  echo '#include "directive_hash.h"' ;				\
+	  echo '#include "hash_tables.h"' ;				\
 	  echo ;							\
 	  cat ${.CURDIR}/parse.c | sed					\
 	    -e '1,/DIRECTIVES-START-TAG/d'				\
@@ -91,7 +91,7 @@ hash:
 	    -e 's/= T0\[/= keyword_T0\[/'				\
 	    -e 's/= T1\[/= keyword_T1\[/'				\
 	    -e 's/g\[f/keyword_g[f/g'					\
-	) > ${.CURDIR}/directive_hash.c
+	) > ${.CURDIR}/hash_tables.c
 
 # Set the shell which make(1) uses.  Bourne is the default, but a decent
 # Korn shell works fine, and much faster.  Using the C shell for this
diff --git a/usr.bin/make/directive_hash.c b/usr.bin/make/hash_tables.c
similarity index 94%
rename from usr.bin/make/directive_hash.c
rename to usr.bin/make/hash_tables.c
index bb43a18014bf..5c5e16a5e6b0 100644
--- a/usr.bin/make/directive_hash.c
+++ b/usr.bin/make/hash_tables.c
@@ -1,12 +1,12 @@
 /*
  * DO NOT EDIT
  * $FreeBSD$
- * auto-generated from FreeBSD: src/usr.bin/make/parse.c,v 1.98 2005/04/28 12:05:43 harti Exp 
+ * auto-generated from FreeBSD: src/usr.bin/make/parse.c,v 1.99 2005/04/29 14:37:44 harti Exp 
  * DO NOT EDIT
  */
 #include <sys/types.h>
 
-#include "directive_hash.h"
+#include "hash_tables.h"
 
 /*
  * d=2
diff --git a/usr.bin/make/directive_hash.h b/usr.bin/make/hash_tables.h
similarity index 95%
rename from usr.bin/make/directive_hash.h
rename to usr.bin/make/hash_tables.h
index 231a84b82126..8fa43a5808da 100644
--- a/usr.bin/make/directive_hash.h
+++ b/usr.bin/make/hash_tables.h
@@ -23,11 +23,10 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $DragonFly$
  * $FreeBSD$
  */
-#ifndef directive_hash_h_
-#define directive_hash_h_
+#ifndef hash_tables_h_
+#define hash_tables_h_
 
 #include <sys/types.h>
 
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index f53cf8bda230..56f9e249ffcd 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -82,10 +82,10 @@ __FBSDID("$FreeBSD$");
 #include "cond.h"
 #include "config.h"
 #include "dir.h"
-#include "directive_hash.h"
 #include "for.h"
 #include "globals.h"
 #include "GNode.h"
+#include "hash_tables.h"
 #include "job.h"
 #include "make.h"
 #include "nonints.h"