diff --git a/ChangeLog b/ChangeLog
index ea3b12705..f59704acd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-03  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.tpl: Rename [+target+] to [+make_target+].
+	* Makefile.def: Rename 'target' to 'make_target'.
+
 2003-05-30  Nick Clifton  <nickc@redhat.com>
 
 	* README-maintainer-mode: Update URL for locating blessed config
diff --git a/Makefile.def b/Makefile.def
index eab03306f..4157c81b2 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -85,14 +85,14 @@ target_modules = { module= boehm-gc; };
 target_modules = { module= qthreads; };
 target_modules = { module= rda; };
 
-// These are (some of) the targets to be done in each subdirectory.
+// These are (some of) the make targets to be done in each subdirectory.
 // Not all; these are the ones which don't have special options.
-recursive_targets = { target= clean; };
-recursive_targets = { target= distclean; };
-recursive_targets = { target= dvi; };
-recursive_targets = { target= info; };
-recursive_targets = { target= install-info; };
-recursive_targets = { target= installcheck; };
-recursive_targets = { target= mostlyclean; };
-recursive_targets = { target= maintainer-clean; };
-recursive_targets = { target= TAGS; };
+recursive_targets = { make_target= clean; };
+recursive_targets = { make_target= distclean; };
+recursive_targets = { make_target= dvi; };
+recursive_targets = { make_target= info; };
+recursive_targets = { make_target= install-info; };
+recursive_targets = { make_target= installcheck; };
+recursive_targets = { make_target= mostlyclean; };
+recursive_targets = { make_target= maintainer-clean; };
+recursive_targets = { make_target= TAGS; };
diff --git a/Makefile.tpl b/Makefile.tpl
index a348206c7..716777c49 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -608,8 +608,8 @@ all-target: [+
 # because it is so large that it can easily overflow the command line
 # length limit on some systems.
 [+ FOR recursive_targets +]
-.PHONY: do-[+target+]
-do-[+target+]:
+.PHONY: do-[+make_target+]
+do-[+make_target+]:
 	@r=`${PWD}`; export r; \
 	s=`cd $(srcdir); ${PWD}`; export s; \
 	$(SET_LIB_PATH) \
@@ -632,7 +632,7 @@ do-[+target+]:
 			"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 	                "RANLIB=$${RANLIB}" \
 			"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-			[+target+]) \
+			[+make_target+]) \
 	    || exit 1; \
 	  else true; fi; \
 	done
@@ -650,7 +650,7 @@ do-[+target+]:
 			"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
 	                "RANLIB=$${RANLIB}" \
 			"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-			[+target+]) \
+			[+make_target+]) \
 	    || exit 1; \
 	  else true; fi; \
 	done