--- a/ChangeLog	Mon Jun 08 07:48:28 2015 +0100
+++ b/ChangeLog	Mon Jun 08 17:14:05 2015 +0100
@@ -1,3 +1,24 @@
+2015-06-08  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* Makefile.am:
+	(CORBA_CHANGESET): Update to icedtea-3.0.0pre04 tag.
+	(JAXP_CHANGESET): Likewise.
+	(JAXWS_CHANGESET): Likewise.
+	(JDK_CHANGESET): Likewise.
+	(LANGTOOLS_CHANGESET): Likewise.
+	(OPENJDK_CHANGESET): Likewise.
+	(NASHORN_CHANGESET): Likewise.
+	(CORBA_SHA256SUM): Likewise.
+	(JAXP_SHA256SUM): Likewise.
+	(JAXWS_SHA256SUM): Likewise.
+	(JDK_SHA256SUM): Likewise.
+	(LANGTOOLS_SHA256SUM): Likewise.
+	(OPENJDK_SHA256SUM): Likewise.
+	(NASHORN_SHA256SUM): Likewise.
+	* NEWS: Updated.
+	* configure.ac: Bump to 3.0.0pre04.
+	* hotspot.map: Update to icedtea-3.0.0pre04 tag.
+
 2014-09-16  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR2411: Fix references to hotspot.map following PR2001

--- a/Makefile.am	Mon Jun 08 07:48:28 2015 +0100
+++ b/Makefile.am	Mon Jun 08 17:14:05 2015 +0100
@@ -4,21 +4,21 @@
 BUILD_VERSION = b21
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = 6c974fba96cb
-JAXP_CHANGESET = e727012c23d9
-JAXWS_CHANGESET = 7ba7b06f15cf
-JDK_CHANGESET = a5c3d9643077
-LANGTOOLS_CHANGESET = 0d5d2b8411d9
-OPENJDK_CHANGESET = 44a10ae251ca
-NASHORN_CHANGESET = d8fc6574c0b2
+CORBA_CHANGESET = b493e7b682c9
+JAXP_CHANGESET = c62dd685e517
+JAXWS_CHANGESET = db7fdb068af9
+JDK_CHANGESET = 8450ad6fa3f5
+LANGTOOLS_CHANGESET = 66f265db6f47
+OPENJDK_CHANGESET = 0503e9c58a13
+NASHORN_CHANGESET = bb36d4894aa4
 
-CORBA_SHA256SUM = 0b65f0faec1d3bea618a5d7ebc5fa734163ee21039e58ba1f38acf99ff92bbca
-JAXP_SHA256SUM = 01dc9a20c521ffa8057dbf47a4f7b555a47156c6f9a1826e2ef893deb830c5cc
-JAXWS_SHA256SUM = 2fc04ea4fabef520222600d533d72eb8305882349f8a6763144032a93bca521f
-JDK_SHA256SUM = 1190242429de1c3c25db5114b35b9237deb53fe776a4b17613641d457030d9c7
-LANGTOOLS_SHA256SUM = 71dbcb8990f66749332d72001ea79b458baa51fcd1086907178c83f07007a860
-OPENJDK_SHA256SUM = b915757c7c17448c670e93b7b9885e46afad43fbf6585c2e0f9d3582237a8bd7
-NASHORN_SHA256SUM = b85c66df90280d529894563ab774968a462a57ad9568d8a2ab31a7f897cbe1e2
+CORBA_SHA256SUM = ededc4d28a6735c88ced8642caf4e08af285f9f5e6cec8ea96aedd525d539468
+JAXP_SHA256SUM = c624f315d5b381c830f3df4e673c6f11200bb8036359524b1f0943fe1f1e7e55
+JAXWS_SHA256SUM = 45abcc59f9910017f6fa0949a76051cad36ea11199acebef01fbc6801cdf5a77
+JDK_SHA256SUM = c69a236376c4d2f9008a2c0f375d572fd8d54f34a8c656761d4c5ac315765af0
+LANGTOOLS_SHA256SUM = 23e22a4e6fdfe3d9a4e09d4001316ec29fee2329f3aaf52fade9e67764b3e7c3
+OPENJDK_SHA256SUM = 50733aaaee4dd8df3206f63eb1a2a7ad001a58370c370da7846d3f32a44486f5
+NASHORN_SHA256SUM = 6932a9f964d76682595279f96364b90bf9f24f557c86b8a68352c93bf94ae386
 
 HS_TYPE = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`"
 HS_URL = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`"

--- a/NEWS	Mon Jun 08 07:48:28 2015 +0100
+++ b/NEWS	Mon Jun 08 17:14:05 2015 +0100
@@ -13,6 +13,9 @@
 New in release 3.0.0 (2014-XX-XX):
 
 * Backports
+  - S4890063, PR2304, RH1214835: HPROF: default text truncated when using doe=n option
+  - S6584008, PR2192, RH1173326: jvmtiStringPrimitiveCallback should not be invoked when string value is null
+  - S6991580, PR2403: IPv6 Nameservers in resolv.conf throws NumberFormatException
   - S8011278: Allow using a system-installed giflib
   - S8012224: AWT_TopLevels/TopLevelEvents/Automated/WindowIconifyDeiconifyEventsTest02 fails on Ubuntu 12.04 Unity shell
   - S8035341: Allow using a system installed libpng
@@ -21,6 +24,17 @@
   - S8042806: Splashscreen uses libjpeg-internal macros
   - S8043805: Allow using a system-installed libjpeg
   - S8044235: src.zip should include all sources
+  - S8067231, PR2401: Zero builds fail after JDK-6898462
+  - S8067364, PR2146, RH114622: Printing to Postscript doesn't support dieresis
+  - S8069072, PR1961, RH1135504: GHASH performance improvement
+  - S8071705. PR2399, RH1182694: Java application menu misbehaves when running multiple screen stacked vertically
+  - S8072385, PR2404: Only the first DNSName entry is checked for endpoint identification
+  - S8074312, PR2253: Enable hotspot builds on 4.x Linux kernels
+  - S8074859, PR1937: Turn on warnings as error
+  - S8076212, PR2402: AllocateHeap() and ReallocateHeap() should be inlined.
+  - S8078482, PR2398, RH1201393: ppc: pass thread to throw_AbstractMethodError
+  - S8078654, PR2332: CloseTTFontFileFunc callback should be removed
+  - S8078666, PR2325: JVM fastdebug build compiled with GCC 5 asserts with "widen increases"
 * Bug fixes
   - S8041658: Use of -fdevirtualize on macroAssembler_x86.o (via -O2) with gcc 4.9.0 creates broken VM
   - PR94: empty install target in Makefile.am
@@ -40,6 +54,7 @@
   - PR1367: Support using the system installation of LCMS
   - PR1369: Remove outdated bootstrap configure tests or make them fail on error
   - PR1379: Add build support for Zero AArch64
+  - PR1413: Undefined reference to libz during link of unpack200
   - PR1766: Expand architecture support
   - PR1774: Support GIF lib v5
   - PR1774: Correct #ifdef to #if
@@ -50,21 +65,26 @@
   - PR1829: Support AM_MAINTAINER_MODE
   - PR1834, RH1022017: Report elliptic curves supported by NSS, not the SunEC library
   - PR1845: jstack.stp in OpenJDK8 is broken
+  - PR1869: Avoid x86 workaround when running Zero rather than a JIT
   - PR1935: HotSpot extraction needs to depend on the tarball being downloaded
+  - PR1937: Add configure option for -Werror
   - PR1938: Zero broken by enforced use of -Werror
   - PR1942: Bug reports lack IcedTea version & distribution packaging information
   - PR1950: Add build support for Zero SH
   - PR1965, G498288: Allow builds on PaX kernels
   - PR1968: Move to new OpenJDK bug URL format
+  - PR1975: SystemTap probes for the garbage collector.
   - PR1977: Support using the system installation of Zlib
   - PR1979: Support using the system installation of libjpeg
   - PR1980: Support using the system installation of giflib
   - PR1981: Support using the system installation of libpng
   - PR1994: make dist broken
   - PR2001: Synchronise HEAD tarball paths with release branch paths
+  - PR2095, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure
   - PR2199: Support giflib 5.1.0
   - PR2212: DGifCloseFile call should check the return value, not the error code, for failure
   - PR2227: giflib 5.1 conditional excludes 6.0, 7.0, etc.
+  - PR2237, RH1194378: ppc64le should report its os.arch as ppc64le so tools can detect it
   - PR2248: HotSpot tarball fails verification after download
   - PR2256: Add SystemTap tests
   - PR2257: clean-extract-nashorn rule is never run
@@ -75,6 +95,7 @@
   - PR2369: SunEC provider is partially installed
   - PR2377: PaX mark the installed JDK so it runs on hardened systems
   - PR2383: Location of docs directory in install-data-local is incorrect
+  - PR2400, RH1206656: Zero JVM crashes on startup when built with GCC 5
   - PR2407: Fix automatic enabling of the Zero build on non-JIT architectures which don't use CACAO or JamVM
   - PR2408: Enable Zero when Shark is enabled
   - PR2409: Update Zero macro to match one in IcedTea 2.x

--- a/configure.ac	Mon Jun 08 07:48:28 2015 +0100
+++ b/configure.ac	Mon Jun 08 17:14:05 2015 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [3.0.0pre03], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [3.0.0pre04], [distro-pkg-dev@openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AM_MAINTAINER_MODE([enable])
 AC_CONFIG_FILES([Makefile])

--- a/hotspot.map.in	Mon Jun 08 07:48:28 2015 +0100
+++ b/hotspot.map.in	Mon Jun 08 17:14:05 2015 +0100
@@ -1,2 +1,2 @@
 # version url changeset md5sum
-default drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 85e5201a55e4 0fcf2f5f49ff4504fd095a57e767ea3c3eb8181e65d9e8b3f3accd3f03ff97b8
+default drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 7e5a87c79d69 5204a95ccacd5d6d7569063bb38788d1f89464e1305d97ebff334bcb922039a8