diff -urN icedtea-orig/Makefile.am icedtea-new/Makefile.am
--- icedtea-orig/Makefile.am	2009-02-10 02:24:20.422799334 +0000
+++ icedtea-new/Makefile.am	2009-02-10 03:24:58.198645880 +0000
@@ -561,7 +561,8 @@
 	patches/icedtea-samejvm-safe.patch \
 	patches/icedtea-6728542-epoll.patch \
 	patches/icedtea-io_util-overflow.patch \
-	patches/icedtea-cc-interp-jvmti.patch
+	patches/icedtea-cc-interp-jvmti.patch \
+	patches/icedtea-hotspot-maxargs.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -urN icedtea-orig/patches/icedtea-hotspot-maxargs.patch icedtea-new/patches/icedtea-hotspot-maxargs.patch
--- icedtea-orig/patches/icedtea-hotspot-maxargs.patch	1970-01-01 00:00:00.000000000 +0000
+++ icedtea-new/patches/icedtea-hotspot-maxargs.patch	2009-02-10 03:31:30.120717581 +0000
@@ -0,0 +1,25 @@
+--- openjdk/hotspot/make/linux/makefiles/sa.make       2009-02-09 14:19:11.629530588 +0000
++++ openjdk/hotspot/make/linux/makefiles/sa.make       2009-02-09 14:18:35.121086328 +0000
+@@ -42,8 +42,6 @@
+ 
+ # gnumake 3.78.1 does not accept the *s that
+ # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
+-AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
+-AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
+ 
+ SA_CLASSDIR = $(GENERATED)/saclasses
+ 
+@@ -74,8 +72,11 @@
+ 	  mkdir -p $(SA_CLASSDIR);        \
+ 	fi
+ 
+-	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1)
+-	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2)
++	echo $(AGENT_FILES1) > t1
++	echo $(AGENT_FILES2) > t2
++
++	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) @t1
++	$(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) @t2
+ 
+ 	$(QUIETLY) $(REMOTE) $(COMPILE.RMIC)  -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
+ 	$(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)