diff -urN icedtea-2.2.1/Makefile.am icedtea-mod/Makefile.am
--- icedtea-2.2.1/Makefile.am	2012-06-16 21:28:55.521850613 -0500
+++ icedtea-mod/Makefile.am	2012-06-16 21:44:32.499840110 -0500
@@ -235,7 +235,8 @@
 
 # Patch list
 
-ICEDTEA_PATCHES =
+ICEDTEA_PATCHES = \
+	patches/openjdk-smgl-paths.patch
 
 # Conditional patches
 
diff -urN icedtea-2.2.1/patches/openjdk-smgl-paths.patch icedtea-mod/patches/openjdk-smgl-paths.patch
--- icedtea-2.2.1/patches/openjdk-smgl-paths.patch	1969-12-31 18:00:00.000000000 -0600
+++ icedtea-mod/patches/openjdk-smgl-paths.patch	2012-06-16 21:43:04.238841099 -0500
@@ -0,0 +1,97 @@
+diff -ur openjdk.orig/corba/make/common/shared/Defs-utils.gmk openjdk/corba/make/common/shared/Defs-utils.gmk
+--- openjdk.orig/corba/make/common/shared/Defs-utils.gmk	2012-06-16 21:31:20.103848993 -0500
++++ openjdk/corba/make/common/shared/Defs-utils.gmk	2012-06-16 21:35:09.405846422 -0500
+@@ -92,15 +92,15 @@
+ DIFF           = $(UTILS_USR_BIN_PATH)diff
+ DIRNAME        = $(UTILS_USR_BIN_PATH)dirname
+ ECHO           = $(UTILS_COMMAND_PATH)echo
+-EGREP          = $(UTILS_COMMAND_PATH)egrep
++EGREP          = $(UTILS_USR_BIN_PATH)egrep
+ EXPR           = $(UTILS_USR_BIN_PATH)expr
+ FILE           = $(UTILS_USR_BIN_PATH)file
+ FIND           = $(UTILS_USR_BIN_PATH)find
+ FMT            = $(UTILS_COMMAND_PATH)fmt
+ GDB            = $(UTILS_USR_BIN_PATH)gdb
+-GREP           = $(UTILS_COMMAND_PATH)grep
++GREP           = $(UTILS_USR_BIN_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
+@@ -128,9 +128,9 @@
+ SHOWREV        = $(UTILS_USR_BIN_PATH)showrev
+ SORT           = $(UTILS_COMMAND_PATH)sort
+ STRIP          = $(UTILS_CCS_BIN_PATH)strip
+-TAIL           = $(UTILS_USR_BIN_PATH)tail
++TAIL           = $(UTILS_COMMAND_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
+@@ -138,7 +138,7 @@
+ UNIQ           = $(UTILS_USR_BIN_PATH)uniq
+ UNZIP          = $(UTILS_USR_BIN_PATH)unzip
+ UNZIPSFX       = $(UTILS_DEVTOOL_PATH)unzipsfx
+-WC             = $(UTILS_USR_BIN_PATH)wc
++WC             = $(UTILS_COMMAND_PATH)wc
+ WHICH          = $(UTILS_USR_BIN_PATH)which
+ YACC           = $(UTILS_CCS_BIN_PATH)yacc
+ ZIPEXE         = $(UTILS_DEVTOOL_PATH)zip
+diff -ur openjdk.orig/jdk/make/common/shared/Defs-utils.gmk openjdk/jdk/make/common/shared/Defs-utils.gmk
+--- openjdk.orig/jdk/make/common/shared/Defs-utils.gmk	2012-06-16 21:31:18.773849007 -0500
++++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2012-06-16 21:39:14.804843671 -0500
+@@ -108,17 +108,17 @@
+ DIRNAME        = $(UTILS_USR_BIN_PATH)dirname
+ DUMP           = $(UTILS_CCS_BIN_PATH)dump
+ ECHO           = $(UTILS_COMMAND_PATH)echo
+-EGREP          = $(UTILS_COMMAND_PATH)egrep
++EGREP          = $(UTILS_USR_BIN_PATH)egrep
+ EXPR           = $(UTILS_USR_BIN_PATH)expr
+ FILE           = $(UTILS_USR_BIN_PATH)file
+ FIND           = $(UTILS_USR_BIN_PATH)find
+ FMT            = $(UTILS_COMMAND_PATH)fmt
+ GDB            = $(UTILS_USR_BIN_PATH)gdb
+-GREP           = $(UTILS_COMMAND_PATH)grep
++GREP           = $(UTILS_USR_BIN_PATH)grep
+ 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
+@@ -145,9 +145,9 @@
+ SH             = $(UTILS_COMMAND_PATH)sh
+ SHOWREV        = $(UTILS_USR_BIN_PATH)showrev
+ SORT           = $(UTILS_COMMAND_PATH)sort
+-TAIL           = $(UTILS_USR_BIN_PATH)tail
++TAIL           = $(UTILS_COMMAND_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
+@@ -156,7 +156,7 @@
+ UNZIP          = $(UTILS_USR_BIN_PATH)unzip
+ UNZIPSFX       = $(UTILS_DEVTOOL_PATH)unzipsfx
+ XARGS          = $(UTILS_USR_BIN_PATH)xargs
+-WC             = $(UTILS_USR_BIN_PATH)wc
++WC             = $(UTILS_COMMAND_PATH)wc
+ WHICH          = $(UTILS_USR_BIN_PATH)which
+ YACC           = $(UTILS_CCS_BIN_PATH)yacc
+ ZIPEXE         = $(UTILS_DEVTOOL_PATH)zip
+@@ -203,7 +203,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           = $(UNIXCOMMAND_PATH)gawk
+   # Intrinsic unix command, with backslash-escaped character interpretation
+   ECHO           = /bin/echo -e
+   # These are really in UTILS_USR_BIN_PATH on Linux