diff --git a/create-jdk8u/Makefile b/create-jdk8u/Makefile
index 424d073e41..b6d23e2928 100644
--- a/create-jdk8u/Makefile
+++ b/create-jdk8u/Makefile
@@ -12,7 +12,7 @@ jdk8u/build/%/spec.gmk: jdk8u/common/autoconf/configure
 jdk-image: jdk8u/build/linux-x86_64-normal-server-release/spec.gmk
 	$(MAKE) -C jdk8u images docs
 
-all: libs/rt.jar libs/jce.jar libs/jsse.jar
+all: libs/rt.jar libs/jce.jar libs/jsse.jar libs/currency.data libs/tzdb.dat
 
 clean:
 	$(MAKE) -C jdk8u clean
@@ -20,6 +20,6 @@ clean:
 libs:
 	mkdir $@
 
-libs/rt.jar libs/jce.jar libs/jsse.jar: libs jdk-image
+libs/rt.jar libs/jce.jar libs/jsse.jar libs/currency.data libs/tzdb.dat: libs jdk-image
 	cp -f jdk8u/build/*/images/j2re-image/lib/$(@F) $@
 
diff --git a/create-jdk8u/build.gradle b/create-jdk8u/build.gradle
index 7c03dcbe3e..715d7cef43 100644
--- a/create-jdk8u/build.gradle
+++ b/create-jdk8u/build.gradle
@@ -50,9 +50,11 @@ task runtimeJar(type: Jar, dependsOn: makeJdk) {
     baseName 'deterministic-rt'
     inputs.dir "libs"
 
-    from(zipTree("libs/rt.jar"))
-    from(zipTree("libs/jce.jar"))
-    from(zipTree("libs/jsse.jar"))
+    from(zipTree('libs/rt.jar'))
+    from(zipTree('libs/jce.jar'))
+    from(zipTree('libs/jsse.jar'))
+    from 'libs/currency.data'
+    from 'libs/tzdb.dat'
 
     reproducibleFileOrder = true
     includeEmptyDirs = false
@@ -102,16 +104,37 @@ task apiJar(type: Jar, dependsOn: runtimeJar) {
         exclude 'java/io/FileReader*.class'
         exclude 'java/io/FileSystem*.class'
         exclude 'java/io/File*Stream*.class'
+        exclude 'java/io/ObjectInputStream*.class'
+        exclude 'java/io/ObjectOutputStream*.class'
+        exclude 'java/io/ObjectStreamClass.class'
+        exclude 'java/io/ObjectStreamConstants.class'
+        exclude 'java/io/ObjectStreamField.class'
         exclude 'java/net/*Content*.class'
         exclude 'java/net/Host*.class'
         exclude 'java/net/Inet*.class'
+        exclude 'java/nio/channels/FileChannel*.class'
+        exclude 'java/nio/channels/spi/'
         exclude 'java/nio/file/Path.class'
         exclude 'java/nio/file/attribute/'
         exclude 'java/util/SplittableRandom*.class'
         exclude 'java/util/Random.class'
         exclude 'java/util/Random$*.class'
         exclude 'java/util/WeakHashMap*.class'
-        exclude 'java/util/concurrent/*.class'
+        exclude 'java/util/concurrent/Blocking*.class'
+        exclude 'java/util/concurrent/CompletionService.class'
+        exclude 'java/util/concurrent/CompletionStage.class'
+        exclude 'java/util/concurrent/ConcurrentLinked*.class'
+        exclude 'java/util/concurrent/ConcurrentNavigable*.class'
+        exclude 'java/util/concurrent/CopyOnWrite*.class'
+        exclude 'java/util/concurrent/*Executor*.class'
+        exclude 'java/util/concurrent/Future*.class'
+        exclude 'java/util/concurrent/Linked*.class'
+        exclude 'java/util/concurrent/RejectedExecution*.class'
+        exclude 'java/util/concurrent/Runnable*.class'
+        exclude 'java/util/concurrent/Semaphore*.class'
+        exclude 'java/util/concurrent/Synchronous*.class'
+        exclude 'java/util/concurrent/Thread*.class'
+        exclude 'java/util/concurrent/TransferQueue.class'
         exclude 'java/util/concurrent/locks/'
         exclude 'javax/activation/'
     }