diff -Naur openjdk/corba/make/common/shared/Defs-utils.gmk openjdk-magellan/corba/make/common/shared/Defs-utils.gmk
--- openjdk/corba/make/common/shared/Defs-utils.gmk	2011-02-28 17:02:15.000000000 +0100
+++ openjdk-magellan/corba/make/common/shared/Defs-utils.gmk	2012-01-05 17:27:41.043981562 +0100
@@ -93,7 +93,7 @@
 GDB            = $(UTILS_USR_BIN_PATH)gdb
 GREP           = $(UTILS_COMMAND_PATH)grep
 GUNZIP         = $(UTILS_COMMAND_PATH)gunzip
-HEAD           = $(UTILS_USR_BIN_PATH)head
+HEAD           = $(UTILS_COMMAND_PATH)head
 ID             = $(UTILS_COMMAND_PATH)id
 ISAINFO        = $(UTILS_COMMAND_PATH)isainfo
 KSH            = $(UTILS_COMMAND_PATH)ksh
@@ -124,7 +124,7 @@
 STRIP          = $(UTILS_CCS_BIN_PATH)strip
 TAIL           = $(UTILS_USR_BIN_PATH)tail
 TAR            = $(UTILS_COMMAND_PATH)tar
-TEST           = $(UTILS_USR_BIN_PATH)test
+TEST           = $(UTILS_COMMAND_PATH)test
 TOUCH          = $(UTILS_COMMAND_PATH)touch
 TR             = $(UTILS_USR_BIN_PATH)tr
 TRUE           = $(UTILS_COMMAND_PATH)true
@@ -176,7 +176,7 @@
   # others have it in /usr/bin.
   SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
 		   $(wildcard $(UTILS_USR_BIN_PATH)sort))
-  NAWK           = $(USRBIN_PATH)gawk
+  NAWK           = $(UTILS_COMMAND_PATH)gawk
   # Intrinsic unix command, with backslash-escaped character interpretation
   ECHO           = /bin/echo -e
   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff -Naur openjdk/jdk/make/common/shared/Defs-utils.gmk openjdk-magellan/jdk/make/common/shared/Defs-utils.gmk
--- openjdk/jdk/make/common/shared/Defs-utils.gmk	2011-02-28 17:06:10.000000000 +0100
+++ openjdk-magellan/jdk/make/common/shared/Defs-utils.gmk	2012-01-05 17:28:15.731981560 +0100
@@ -106,7 +106,7 @@
 GDB            = $(UTILS_USR_BIN_PATH)gdb
 GREP           = $(UTILS_COMMAND_PATH)grep
 GUNZIP         = $(UTILS_COMMAND_PATH)gunzip
-HEAD           = $(UTILS_USR_BIN_PATH)head
+HEAD           = $(UTILS_COMMAND_PATH)head
 ID             = $(UTILS_COMMAND_PATH)id
 ISAINFO        = $(UTILS_COMMAND_PATH)isainfo
 KSH	       = $(UTILS_COMMAND_PATH)ksh
@@ -136,7 +136,7 @@
 STRIP          = $(UTILS_CCS_BIN_PATH)strip
 TAIL           = $(UTILS_USR_BIN_PATH)tail
 TAR            = $(UTILS_COMMAND_PATH)tar
-TEST           = $(UTILS_USR_BIN_PATH)test
+TEST           = $(UTILS_COMMAND_PATH)test
 TOUCH          = $(UTILS_COMMAND_PATH)touch
 TR             = $(UTILS_USR_BIN_PATH)tr
 TRUE           = $(UTILS_COMMAND_PATH)true
@@ -178,7 +178,7 @@
   BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \
                        $(wildcard $(UTILS_USR_BIN_PATH)basename))
 
-  NAWK           = $(USRBIN_PATH)gawk
+  NAWK           = $(UTILS_COMMAND_PATH)gawk
   # Intrinsic unix command, with backslash-escaped character interpretation
   ECHO           = /bin/echo -e
   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)