diff --git a/gnattools/ChangeLog b/gnattools/ChangeLog
index 7375dbea33b..c9685f81db2 100644
--- a/gnattools/ChangeLog
+++ b/gnattools/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-20  Arnaud Charlet  <charlet@adacore.com>
+
+	* Makefile.in (GNATTOOLS2_FILES): Replaced by common-tools target
+	in gcc/ada/Makefile.in
+
 2008-05-13  Arnaud Charlet  <charlet@adacore.com>
 
 	PR ada/31808
diff --git a/gnattools/Makefile.in b/gnattools/Makefile.in
index 4c50d6e1cce..46da2df8ba7 100644
--- a/gnattools/Makefile.in
+++ b/gnattools/Makefile.in
@@ -146,18 +146,6 @@ TOOLS_FLAGS_TO_PASS_CROSS= \
 EXTRA_GNATTOOLS = @EXTRA_GNATTOOLS@
 TOOLS_TARGET_PAIRS = @TOOLS_TARGET_PAIRS@
 
-# These are built by gnatmake, and in both native and cross configurations.
-GNATTOOLS2_FILES = \
-	../../gnatchop$(exeext) \
-	../../gnat$(exeext) \
-	../../gnatkr$(exeext) \
-	../../gnatls$(exeext) \
-	../../gnatprep$(exeext) \
-	../../gnatxref$(exeext) \
-	../../gnatfind$(exeext) \
-	../../gnatname$(exeext) \
-	../../gnatclean$(exeext)
-
 # Makefile targets
 # ----------------
 
@@ -202,8 +190,7 @@ gnattools-native: $(GCC_DIR)/stamp-tools $(GCC_DIR)/stamp-gnatlib
 	  ../../gnatmake$(exeext) ../../gnatlink$(exeext)
 	# gnattools2
 	$(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
-	  $(TOOLS_FLAGS_TO_PASS_NATIVE) \
-	  $(GNATTOOLS2_FILES)
+	  $(TOOLS_FLAGS_TO_PASS_NATIVE) common-tools
 
 # gnatmake/link can be built with recent gnatmake/link if they are available.
 # This is especially convenient for building cross tools or for rebuilding
@@ -215,8 +202,7 @@ regnattools: $(GCC_DIR)/stamp-gnatlib
 	  gnatmake-re gnatlink-re
 	# gnattools2
 	$(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
-	  $(TOOLS_FLAGS_TO_PASS_NATIVE) \
-	  $(GNATTOOLS2_FILES)
+	  $(TOOLS_FLAGS_TO_PASS_NATIVE) common-tools
 
 # For cross builds of gnattools,
 # put the host RTS dir first in the PATH to hide the default runtime
@@ -230,8 +216,7 @@ gnattools-cross: $(GCC_DIR)/stamp-tools
 	  gnatmake-re gnatlink-re
 	# gnattools2
 	$(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
-	  $(TOOLS_FLAGS_TO_PASS_CROSS) \
-	  $(GNATTOOLS2_FILES)
+	  $(TOOLS_FLAGS_TO_PASS_CROSS) common-tools
 	# Rename cross tools to where the GCC makefile wants them when
 	# installing.  FIXME: installation should be done elsewhere.
 	if [ -f $(GCC_DIR)/gnatbind$(exeext) ] ; then \