diff --git a/contrib/crossrpms/gcc/target-c++.add b/contrib/crossrpms/gcc/target-c++.add
index 9fe7cacd99..630334c4f3 100644
--- a/contrib/crossrpms/gcc/target-c++.add
+++ b/contrib/crossrpms/gcc/target-c++.add
@@ -1,6 +1,6 @@
 %if %build_cxx
 # ==============================================================
-# @tool_target@-c++
+# @rpmprefix@@tool_target@-c++
 # ==============================================================
 %package -n @rpmprefix@@tool_target@-c++
 Summary:	GCC c++ compiler for @tool_target@
diff --git a/contrib/crossrpms/gcc/target-g77.add b/contrib/crossrpms/gcc/target-g77.add
index 88b8694bd5..eaee506dd7 100644
--- a/contrib/crossrpms/gcc/target-g77.add
+++ b/contrib/crossrpms/gcc/target-g77.add
@@ -1,6 +1,6 @@
 %if %build_g77
 # ==============================================================
-# @tool_target@-g77
+# @rpmprefix@@tool_target@-g77
 # ==============================================================
 %package -n @rpmprefix@@tool_target@-g77
 Summary:        Fortran 77 support for @tool_target@-gcc
diff --git a/contrib/crossrpms/gcc/target-gcc.add b/contrib/crossrpms/gcc/target-gcc.add
index c0c943a478..153c570bc3 100644
--- a/contrib/crossrpms/gcc/target-gcc.add
+++ b/contrib/crossrpms/gcc/target-gcc.add
@@ -1,5 +1,5 @@
 # ==============================================================
-# @tool_target@-gcc
+# @rpmprefix@@tool_target@-gcc
 # ==============================================================
 %package -n @rpmprefix@@tool_target@-gcc
 Summary:        GNU cc compiler for @tool_target@
diff --git a/contrib/crossrpms/gcc/target-gcj.add b/contrib/crossrpms/gcc/target-gcj.add
index 598335d6a4..1a47c407e6 100644
--- a/contrib/crossrpms/gcc/target-gcj.add
+++ b/contrib/crossrpms/gcc/target-gcj.add
@@ -1,6 +1,6 @@
 %if %build_gcj
 # ==============================================================
-# @tool_target@-gcj
+# @rpmprefix@@tool_target@-gcj
 # ==============================================================
 %package -n @rpmprefix@@tool_target@-gcj
 Summary:        Java support (gcj) for @tool_target@-gcc
diff --git a/contrib/crossrpms/gcc/target-gfortran.add b/contrib/crossrpms/gcc/target-gfortran.add
index 8abf0db232..b51a18c936 100644
--- a/contrib/crossrpms/gcc/target-gfortran.add
+++ b/contrib/crossrpms/gcc/target-gfortran.add
@@ -1,6 +1,6 @@
 %if %build_f95
 # ==============================================================
-# @tool_target@-gfortran
+# @rpmprefix@@tool_target@-gfortran
 # ==============================================================
 %package -n @rpmprefix@@tool_target@-gfortran
 Summary:	Fortran 95 support for @tool_target@-gcc
diff --git a/contrib/crossrpms/gcc/target-gnat.add b/contrib/crossrpms/gcc/target-gnat.add
index 20fd8a287d..5bb45a5d41 100644
--- a/contrib/crossrpms/gcc/target-gnat.add
+++ b/contrib/crossrpms/gcc/target-gnat.add
@@ -1,6 +1,6 @@
 %if %build_gnat
 # ==============================================================
-# @tool_target@-gnat
+# @rpmprefix@@tool_target@-gnat
 # ==============================================================
 %package -n @rpmprefix@@tool_target@-gnat
 Summary:        Ada support for for @tool_target@-gcc
diff --git a/contrib/crossrpms/gcc/target-objc.add b/contrib/crossrpms/gcc/target-objc.add
index 4c3e0bc645..3c11888a3a 100644
--- a/contrib/crossrpms/gcc/target-objc.add
+++ b/contrib/crossrpms/gcc/target-objc.add
@@ -1,6 +1,6 @@
 %if %build_objc
 # ==============================================================
-# @tool_target@-objc
+# @rpmprefix@@tool_target@-objc
 # ==============================================================
 %package -n @rpmprefix@@tool_target@-objc
 Summary:        Objective C support for @tool_target@-gcc