diff --git a/satellites/icedtea.sat b/satellites/icedtea.sat
index 4b3fac2..4d8b026 100644
--- a/satellites/icedtea.sat
+++ b/satellites/icedtea.sat
@@ -1,25 +1,25 @@
 import 'compile/configure'
 
 name=icedtea
-version=3.7.0
-version_bootstrap=2.6.13
+version=3.9.0
+version_bootstrap=2.6.14
 version_gcc=6.4.0
 version_ecj=4.9
-version_apache_ant=1.9.11
+version_apache_ant=1.9.13
 
 define_option '!bootstrap: Bootstrap this program'
 
 dlextract "http://icedtea.wildebeest.org/download/source/$name-$version.tar.xz" \
-          '648a52c2f008ee0bbb865a2a1768891b'
+          '7d4b94877cde222232433201a634a918'
 modules="
-    2ee9aa7e85ed2fb9af1ab87fb87e404b-corba.tar.xz
-    85693d6cd04ca1b9a694afa81e7c4dda-hotspot.tar.xz
-    c3a5eb1567ac3d8cbfa3dd8cd0848b6f-jaxp.tar.xz
-    286778356533d5fe3d8ab9c2c747fe3b-jaxws.tar.xz
-    84c39ca647e24fe81c08bc10e016d194-jdk.tar.xz
-    c03e84cceca1d9173b409920fad3aa93-langtools.tar.xz
-    4895a6a002374c0dea0be055cb75b9a5-nashorn.tar.xz
-    c686c8d283bc9f89a8874c5344d4e83a-openjdk.tar.xz
+    f79e08350fd86f4fcbf375f109e494d3-corba.tar.xz
+    b5be7e80c38ccc5aa60172663b185d01-hotspot.tar.xz
+    b94287d6e7565da8a076f656bf1582d6-jaxp.tar.xz
+    51b028fc374725e3099fc9870fc6a019-jaxws.tar.xz
+    975901f03d2009ccebbd7aabb81c9390-jdk.tar.xz
+    8e5bc17e7001bb00611ce7636365fb78-langtools.tar.xz
+    02cb66948f875d74de4e051a2b061910-nashorn.tar.xz
+    da51bd447df8551f914f8fb099bce868-openjdk.tar.xz
 "
 for module in $modules; do
     package="$(echo "$module" | cut -d- -f2)"
@@ -41,19 +41,19 @@ if option bootstrap; then
 
     ( name=apache-ant version="$version_apache_ant"
         dlextract "https://www.apache.org/dist/ant/source/$name-$version-src.tar.bz2" \
-                  'b3fc479d9f3b9fd5af4cdf08ac172c55'
+                  'a551e79a0729e6f5a335cacd7d712343'
     )
 
     dlextract "http://icedtea.wildebeest.org/download/source/$name-$version_bootstrap.tar.xz" \
-              'a0fad4c5c9b4ec59240afff6484c6764'
+              'ec7bf064e33e35dd3845d044e175a698'
     bootstrap_modules="
-        6e30aa6f2393537d2558b51f7793aa4c-corba.tar.bz2
-        036fdb0a696857f42e70403916267267-hotspot.tar.bz2
-        74525da9d7f57bf6640fe3aed591d455-jaxp.tar.bz2
-        89a547e306caba44416c2c86b7704146-jaxws.tar.bz2
-        a8aa55d0b7a1aaceadf0b6886d326c17-jdk.tar.bz2
-        b00e63ffee72633aa88d3cdf33686da3-langtools.tar.bz2
-        f56a3ebf4774ec78b35422c93ccb95c4-openjdk.tar.bz2
+        96b72013cce3000cb46808aa9f9bce40-corba.tar.bz2
+        b190d917e60aeba3d9b7d1c61660ea68-hotspot.tar.bz2
+        d3c9cf8e51c043bdb0db360ffaf34d8c-jaxp.tar.bz2
+        f087bbcaffbb65906514448dc49f173e-jaxws.tar.bz2
+        6580efb17017a4a9402a4a5043374bd7-jdk.tar.bz2
+        1518c296a6125af5119aa5442d88bebf-langtools.tar.bz2
+        307abf13b695c61a8b16d9fa384277db-openjdk.tar.bz2
     "
     for module in $bootstrap_modules; do
         package="$(echo "$module" | cut -d- -f2)"
@@ -161,12 +161,9 @@ make
 mkdir -p "$dir_install/$dir_prefix/$dir_lib/jvm/${name}8"
 cp -Ta openjdk.build/images/j2sdk-image "$dir_install/$dir_prefix/$dir_lib/jvm/${name}8"
 
-# Link default jvm
-ln -s "${name}8" "$dir_install/$dir_prefix/$dir_lib/jvm/default"
-
 # Add profile script
 cat > java.sh << EOF
-export JAVA_HOME="/$dir_prefix/$dir_lib/jvm/default"
+export JAVA_HOME="/$dir_prefix/$dir_lib/jvm/icedtea8"
 export PATH="\$PATH:\$JAVA_HOME/bin"
 export MANPATH="\$MANPATH:\$JAVA_HOME/man"
 EOF