--- a/ChangeLog	Mon Sep 03 20:38:12 2018 +0100
+++ b/ChangeLog	Sun Sep 09 14:26:05 2018 +0100
@@ -1,3 +1,27 @@
+2018-09-05  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	Bump to icedtea-3.9.0.
+	* Makefile.am:
+	(JDK_UPDATE_VERSION): Bump to 181.
+	(BUILD_VERSION): Bump to b13.
+	(CORBA_CHANGESET): Update to icedtea-3.9.0 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.9.0.
+	* hotspot.map.in: Update to icedtea-3.9.0 tag.
+
 2018-09-01  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	Bump aarch32 to jdk8u172-b11-aarch32-180511.

--- a/Makefile.am	Mon Sep 03 20:38:12 2018 +0100
+++ b/Makefile.am	Sun Sep 09 14:26:05 2018 +0100
@@ -1,24 +1,24 @@
 # Dependencies
 
-JDK_UPDATE_VERSION = 172
-BUILD_VERSION = b11
+JDK_UPDATE_VERSION = 181
+BUILD_VERSION = b13
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = 61ac065e580f
-JAXP_CHANGESET = 217db4fbcf13
-JAXWS_CHANGESET = 10aadc3f0947
-JDK_CHANGESET = 8e0b55064628
-LANGTOOLS_CHANGESET = 96b0caf1aad9
-OPENJDK_CHANGESET = 6b8030f5f902
-NASHORN_CHANGESET = 0864fd4f2ada
-
-CORBA_SHA256SUM = 2f9c56935f55d9ac54aaadf8acab7c91b10509a4a6bde005ce020bb3dfdd8a68
-JAXP_SHA256SUM = b850dbf8f58e69e9abc0e6d9988ca11eeddc53d7eb04d335803565da8964e4b6
-JAXWS_SHA256SUM = b1a7573cfcca3c3694809458f723aa428df7ae973f490bcd44844f0eee155b36
-JDK_SHA256SUM = 32613211c68be4e741453ec5dc7f0b96a8604700e5728817abb888e13f54c7fd
-LANGTOOLS_SHA256SUM = 9cb8a2a057e3ceed18b7dddb709918700a3bb4a762fa28c0d8ce15c9a5af4e3e
-OPENJDK_SHA256SUM = f127ec05441d8ad8a1e52d18bd259db688e952e925ae9b015572b02afb008ff6
-NASHORN_SHA256SUM = 13ff60146ece8b215fbed4285d6d13238d1c9530d2a68af597a92dda97728c31
+CORBA_CHANGESET = c120c4fb7b31
+JAXP_CHANGESET = 55420c5cc9f3
+JAXWS_CHANGESET = f824de94c42e
+JDK_CHANGESET = 7b289a33ab97
+LANGTOOLS_CHANGESET = 8496472630c5
+OPENJDK_CHANGESET = 3b2d372838b9
+NASHORN_CHANGESET = 79a2c8e2babc
+
+CORBA_SHA256SUM = 47cfbcd6612af9161e35b8ed5ffe5519624062ccaa3b5cc2f1a13b1d9228d380
+JAXP_SHA256SUM = 20e821b18d1415920d3b53bff7faba1d76fe82fdbe08359f8a68c2ff5b17c56d
+JAXWS_SHA256SUM = 5003bc7110d256af32dcd649318f927cba7260938e029e71c222f4aa13e780b2
+JDK_SHA256SUM = 496b164f739f37ef241faea8329be9654b92c42633a9849f5a45b4bedf015337
+LANGTOOLS_SHA256SUM = 0910b84754e5c36ab93acd2f617a8cb6095a4db76130de001193dca93a96af03
+OPENJDK_SHA256SUM = 0889cdfb8620950bc9922ef58df8313dc85b5be27dd515bfbfcfbc1bce1a1f46
+NASHORN_SHA256SUM = 170f328f57bc1efe50c31bfcee459e15cfb251f77a67c1f6a69d8634e51f8138
 
 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 Sep 03 20:38:12 2018 +0100
+++ b/NEWS	Sun Sep 09 14:26:05 2018 +0100
@@ -13,6 +13,12 @@
 New in release 3.9.0 (2018-07-XX):
 
 * Security fixes
+  - S8191239: Improve desktop file usage
+  - S8193419: Better Internet address support
+  - S8197871, CVE-2018-2938: Support Derby connections
+  - S8197925, CVE-2018-2940: Better stack walking
+  - S8199547, CVE-2018-2952: Exception to Pattern Syntax
+  - S8200666, CVE-2018-2973: Improve LDAP support
   - PR3607, CVE-2018-3639: hw: cpu: speculative store bypass mitigation
 * Import of OpenJDK 8 u172 build 11
   - S8031304: Add dcmd to print all loaded dynamic libraries.
@@ -49,6 +55,38 @@
   - S8192987: keytool should remember real storetype if it is not provided
   - S8193156: Need to backout fixes for JDK-8058547, JDK-8055753, JDK-8085903
   - S8193807: Avoid UnsatisfiedLinkError on AIX by providing empty basic implementations of getSystemCpuLoad and getProcessCpuLoad
+* Import of OpenJDK 8 u181 build 13
+  - S8038636: speculative traps break when classes are redefined
+  - S8051972: sun/security/pkcs11/ec/ReadCertificates.java fails intermittently
+  - S8055008: Clean up code that saves the previous versions of redefined classes
+  - S8057570: RedefineClasses() tests fail assert(((Metadata*)obj)->is_valid()) failed: obj is valid
+  - S8074373: NMT is not enabled if NMT option is specified after class path specifiers
+  - S8076117: EndEntityChecker should not process custom extensions after PKIX validation
+  - S8156137: SIGSEGV in ReceiverTypeData::clean_weak_klass_links
+  - S8157898: SupportedDSAParamGen.java failed with timeout
+  - S8169201: Montgomery multiply intrinsic should use correct name
+  - S8170035: When determining the ciphersuite lists, there is no debug output for disabled suites.
+  - S8176183: sun/security/mscapi/SignedObjectChain.java fails on Windows
+  - S8187045: [linux] Not all libraries in the VM are linked with -z,noexecstack
+  - S8187635: On Windows Swing changes keyboard layout on a window activation
+  - S8188223: IfNode::range_check_trap_proj() should handler dying subgraph with single if proj
+  - S8196224: Even better Internet address support
+  - S8196491: Newlines in JAXB string values of SOAP-requests are escaped to "
"
+  - S8196854: TestFlushableGZIPOutputStream failing with IndexOutOfBoundsException
+  - S8197943: Unable to use JDWP API in JDK 8 to debug JDK 9 VM
+  - S8198605: Touch keyboard is shown for a non-focusable text component
+  - S8198606: Touch keyboard does not hide, when a text component looses focus
+  - S8198794: Hotspot crash on Cassandra 3.11.1 startup with libnuma 2.0.3
+  - S8199406: Performance drop with Java JDK 1.8.0_162-b32
+  - S8199748: Touch keyboard is not shown, if text component gets focus from other text component
+  - S8200359: (tz) Upgrade time-zone data to tzdata2018d
+  - S8201433: Fix potential crash in BufImg_SetupICM
+  - S8202585: JDK 8u181 l10n resource file update
+  - S8202996: Remove debug print statements from RMI fix
+  - S8203233: (tz) Upgrade time-zone data to tzdata2018e
+  - S8203368: ObjectInputStream filterCheck method throws NullPointerException
+  - S8204874: Update THIRDPARTYREADME file
+  - S8205491: adjust reflective access checks
 * Backports
   - S8008321, PR3599: compile.cpp verify_graph_edges uses bool as int
   - S8064786, PR3601: Fix debug build after 8062808: Turn on the -Wreturn-type warning

--- a/configure.ac	Mon Sep 03 20:38:12 2018 +0100
+++ b/configure.ac	Sun Sep 09 14:26:05 2018 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [3.9.0pre02], [distro-pkg-dev@openjdk.java.net])
+AC_INIT([icedtea], [3.9.0], [distro-pkg-dev@openjdk.java.net])
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])

--- a/hotspot.map.in	Mon Sep 03 20:38:12 2018 +0100
+++ b/hotspot.map.in	Sun Sep 09 14:26:05 2018 +0100
@@ -1,4 +1,4 @@
 # version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 88515137e73f 011370479a1f927c0cd9383c3b987f0e1c8ce9697d5bba02a5100da5dd2794a7
+default drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 16ee3c35fef2 afd62ca7af0af93ab3cdad29ade1b90dfb39d3443884f382b3a817a26e21c3f4
 shenandoah drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ 923b7475c897 509febb41f786879c091500ec98e6a8dfbca16e419b2bbdcaecb7f522558cae5
 aarch32 drop http://icedtea.classpath.org/download/drops/icedtea8/@ICEDTEA_RELEASE@ e749b2f34b5e f69d992385d607b46ddb78373f7964c1a3b30f95c809e4669b804cf2f0f137ad