diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am
index cbe866d647..5847115d8c 100644
--- a/epan/dissectors/Makefile.am
+++ b/epan/dissectors/Makefile.am
@@ -83,15 +83,15 @@ x11-declarations.h x11-register-info.h: $(PROC_X11_FIELDS) $(X11_FIELDS)
 # a register.c file for libethereal.
 # All subsequent arguments are the files to scan.
 #
-register.c: $(plugin_src) $(DISSECTOR_SRC) $(top_srcdir)/tools/make-reg-dotc \
-    $(top_srcdir)/tools/make-reg-dotc.py
+register.c: $(plugin_src) $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg \
+    $(top_srcdir)/tools/make-dissector-reg.py
 	@if test -n $(PYTHON); then \
 		echo Making register.c with python ; \
-		$(PYTHON) $(top_srcdir)/tools/make-reg-dotc.py $(srcdir) \
+		$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
 		    dissectors $(DISSECTOR_SRC) ; \
 	else \
 		echo Making register.c with shell script ; \
-		$(top_srcdir)/tools/make-reg-dotc $(srcdir) \
+		$(top_srcdir)/tools/make-dissector-reg $(srcdir) \
 		   dissectors $(plugin_src) $(DISSECTOR_SRC) ; \
 	fi
 
diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake
index 36fb60cb9c..f8f4940a85 100644
--- a/epan/dissectors/Makefile.nmake
+++ b/epan/dissectors/Makefile.nmake
@@ -75,10 +75,10 @@ x11-declarations.h x11-register-info.h: x11-fields process-x11-fields.pl
 register.c: $(DISSECTOR_SRC)
 !IFDEF PYTHON
 	@echo Making register.c (using python)
-	@$(PYTHON) ../../tools/make-reg-dotc.py . dissectors $(DISSECTOR_SRC)
+	@$(PYTHON) ../../tools/make-dissector-reg.py . dissectors $(DISSECTOR_SRC)
 !ELSE
 	@echo Making register.c (using sh)
-	@$(SH) ../../tools/make-reg-dotc . dissectors $(DISSECTOR_SRC)
+	@$(SH) ../../tools/make-dissector-reg . dissectors $(DISSECTOR_SRC)
 !ENDIF
 
 packet-ncp2222.c : ncp2222.py
diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am
index bcf6f4f10f..46cc8355a2 100644
--- a/plugins/docsis/Makefile.am
+++ b/plugins/docsis/Makefile.am
@@ -75,15 +75,15 @@ LIBS =
 # a plugin.c file for a plugin.
 # All subsequent arguments are the files to scan.
 #
-plugin.c: $(DISSECTOR_SRC) $(top_srcdir)/tools/make-reg-dotc \
-    $(top_srcdir)/tools/make-reg-dotc.py
+plugin.c: $(DISSECTOR_SRC) $(top_srcdir)/tools/make-dissector-reg \
+    $(top_srcdir)/tools/make-dissector-reg.py
 	@if test -n $(PYTHON); then \
 		echo Making plugin.c with python ; \
-		$(PYTHON) $(top_srcdir)/tools/make-reg-dotc.py $(srcdir) \
+		$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
 		    plugin $(DISSECTOR_SRC) ; \
 	else \
 		echo Making plugin.c with shell script ; \
-		$(top_srcdir)/tools/make-reg-dotc $(srcdir) \
+		$(top_srcdir)/tools/make-dissector-reg $(srcdir) \
 		    $(plugin_src) plugin $(DISSECTOR_SRC) ; \
 	fi
 
diff --git a/plugins/docsis/Makefile.nmake b/plugins/docsis/Makefile.nmake
index 32883427d9..383dbf300d 100644
--- a/plugins/docsis/Makefile.nmake
+++ b/plugins/docsis/Makefile.nmake
@@ -63,10 +63,10 @@ docsis.dll docsis.exp docsis.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
 plugin.c: $(DISSECTOR_SRC)
 !IFDEF PYTHON
 	@echo Making plugin.c (using python)
-	@$(PYTHON) ../../tools/make-reg-dotc.py . plugin $(DISSECTOR_SRC)
+	@$(PYTHON) ../../tools/make-dissector-reg.py . plugin $(DISSECTOR_SRC)
 !ELSE
 	@echo Making plugin.c (using sh)
-	@$(SH) ../../tools/make-reg-dotc . plugin $(DISSECTOR_SRC)
+	@$(SH) ../../tools/make-dissector-reg . plugin $(DISSECTOR_SRC)
 !ENDIF
 
 !ENDIF
diff --git a/tools/Makefile.am b/tools/Makefile.am
index c9066aa857..9ecf845386 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -72,8 +72,8 @@ EXTRA_DIST = \
 	dfilter-test.py 				\
 	fuzz-test.sh					\
 	lex.py						\
-	make-reg-dotc					\
-	make-reg-dotc.py				\
+	make-dissector-reg				\
+	make-dissector-reg.py				\
 	msnchat						\
 	netscreen2dump.py				\
 	pkt-from-core.py				\
diff --git a/tools/make-reg-dotc b/tools/make-dissector-reg
similarity index 99%
rename from tools/make-reg-dotc
rename to tools/make-dissector-reg
index 19706dada5..fe403cc5f6 100755
--- a/tools/make-reg-dotc
+++ b/tools/make-dissector-reg
@@ -42,7 +42,6 @@ then
 #endif
 
 #include <gmodule.h>
-#include "register.h"
 
 #include "moduleinfo.h"
 
diff --git a/tools/make-reg-dotc.py b/tools/make-dissector-reg.py
similarity index 99%
rename from tools/make-reg-dotc.py
rename to tools/make-dissector-reg.py
index 9d6a232edb..31de5549a1 100644
--- a/tools/make-reg-dotc.py
+++ b/tools/make-dissector-reg.py
@@ -104,7 +104,6 @@ if registertype == "plugin":
 #endif
 
 #include <gmodule.h>
-#include "register.h"
 
 #include "moduleinfo.h"