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	2012-02-15 09:26:34.000000000 +0100
+++ openjdk-magellan/corba/make/common/shared/Defs-utils.gmk	2012-02-19 19:04:58.293982932 +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
@@ -107,7 +107,7 @@
 MKSINFO        = $(UTILS_COMMAND_PATH)mksinfo
 MSGFMT         = $(UTILS_USR_BIN_PATH)msgfmt
 MV             = $(UTILS_COMMAND_PATH)mv
-NAWK           = $(UTILS_USR_BIN_PATH)nawk
+NAWK           = $(UTILS_COMMAND_PATH)nawk
 NM             = $(UTILS_CCS_BIN_PATH)nm
 PKGMK          = $(UTILS_COMMAND_PATH)pkgmk
 PRINTF         = $(UTILS_USR_BIN_PATH)printf
@@ -123,7 +123,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
@@ -175,7 +175,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	2012-02-15 09:26:50.000000000 +0100
+++ openjdk-magellan/jdk/make/common/shared/Defs-utils.gmk	2012-02-19 19:06:04.359982932 +0100
@@ -111,7 +111,7 @@
 GUNZIP         = $(UTILS_COMMAND_PATH)gunzip
 # GZIP is used for solaris. Linux and windows use tar czf
 GZIP           = $(UTILS_COMMAND_PATH)gzip
-HEAD           = $(UTILS_USR_BIN_PATH)head
+HEAD           = $(UTILS_COMMAND_PATH)head
 HG             = hg
 ID             = $(UTILS_COMMAND_PATH)id
 ISAINFO        = $(UTILS_COMMAND_PATH)isainfo
@@ -125,7 +125,7 @@
 MKSINFO        = $(UTILS_COMMAND_PATH)mksinfo
 MSGFMT         = $(UTILS_USR_BIN_PATH)msgfmt
 MV             = $(UTILS_COMMAND_PATH)mv
-NAWK           = $(UTILS_USR_BIN_PATH)nawk
+NAWK           = $(UTILS_COMMAND_PATH)nawk
 PKGMK          = $(UTILS_COMMAND_PATH)pkgmk
 PRINTF         = $(UTILS_USR_BIN_PATH)printf
 PWD            = $(UTILS_COMMAND_PATH)pwd
@@ -139,7 +139,7 @@
 SORT           = $(UTILS_COMMAND_PATH)sort
 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
@@ -195,7 +195,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