Index: icedtea-580/Makefile.am
===================================================================
--- icedtea-580/Makefile.am
+++ icedtea-580/Makefile.am	2008-02-11 16:10:23.000000000 +0200
@@ -428,7 +428,9 @@
 	  cp -af gcjwebplugin.so \
 	    $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
 	fi
-	$(FASTJAR) uf $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/tools.jar \
+	$(FASTJAR) cf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/javaws.jar \
+	  -C lib/tools .
+	$(FASTJAR) cf $(BUILD_OUTPUT_DIR)/j2re-image/lib/javaws.jar \
 	  -C lib/tools .
 	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
 
@@ -447,8 +449,11 @@
 	  cp -af gcjwebplugin.so \
 	    $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \
 	fi
-	$(FASTJAR) uf $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/lib/tools.jar \
-	  -C lib/tools .
+	$(FASTJAR) cf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/javaws.jar \
+		-C lib/tools .
+	$(FASTJAR) cf $(BUILD_OUTPUT_DIR)/j2re-image/lib/javaws.jar \
+		-C lib/tools .
+
 	@echo "IcedTea (debug build) is served:" \
 	  $(BUILD_OUTPUT_DIR)-debug
 
Index: icedtea-580/patches/icedtea-jnlp-launcher.patch
===================================================================
--- icedtea-580/patches/icedtea-jnlp-launcher.patch
+++ icedtea-580/patches/icedtea-jnlp-launcher.patch	2008-02-11 16:13:10.000000000 +0200
@@ -9,15 +9,21 @@
  $(call make-launcher, orbd, com.sun.corba.se.impl.activation.ORBD, \
    -J-Dcom.sun.CORBA.activation.DbDir=./orb.db \
    -J-Dcom.sun.CORBA.activation.Port=1049 \
---- openjdk/jdk/make/common/Release.gmk.orig	2008-01-02 15:10:01.000000000 -0500
-+++ openjdk/jdk/make/common/Release.gmk	2008-01-02 15:10:29.000000000 -0500
-@@ -469,7 +469,8 @@
- 	wsimport$(EXE_SUFFIX) \
-         schemagen$(EXE_SUFFIX) \
- 	jsadebugd$(EXE_SUFFIX) \
--	jhat$(EXE_SUFFIX)
-+	jhat$(EXE_SUFFIX) \
-+	javaws$(EXE_SUFFIX)
+Index: openjdk/jdk/make/launchers/Makefile.launcher
+===================================================================
+--- openjdk/jdk/make/launchers/Makefile.launcher
++++ openjdk/jdk/make/launchers/Makefile.launcher       2008-02-10 17:29:50.000000000 +0200
+@@ -153,6 +153,12 @@
+   endif
+ endif
  
- # The following get removed from the JRE after the bulk-copy of LIBDIR...
- NOTJRELIBS = tools.jar \
++# javaws only
++ifeq ($(PROGRAM),javaws)
++  JAVAWS_CLASSPATH = "{ \"/lib/javaws.jar\", \"/classes\" }"
++  OTHER_CPPFLAGS += -DAPP_CLASSPATH=$(JAVAWS_CLASSPATH)
++endif
++
+ # GUI tools
+ ifeq ($(GUI_TOOL),true)
+   ifneq ($(PLATFORM), windows)
+