diff --git a/clonejdk.sh b/clonejdk.sh
index 392676e..787cd63 100755
--- a/clonejdk.sh
+++ b/clonejdk.sh
@@ -7,6 +7,10 @@ bash ./get_source.sh
 cd hotspot
 hg import ../../termux-openjdk-aarch64-patches/hotspot/*.patch --no-commit
 
+cd ..
+cd jdk
+hg import ../../termux-openjdk-aarch64-patches/jdk/*.patch --no-commit
+
 cd ..
 hg import ../termux-openjdk-aarch64-patches/*.patch --no-commit
 
diff --git a/termux-openjdk-aarch64-patches/jdk-java_home.patch b/termux-openjdk-aarch64-patches/jdk-java_home.patch
deleted file mode 100644
index fd04081..0000000
--- a/termux-openjdk-aarch64-patches/jdk-java_home.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./jdk/src/java.base/unix/native/libjli/java_md_solinux.c	2017-03-30 20:45:48.000000000 +0530
-+++ ./jdk/src/java.base/unix/native/libjli/java_md_solinux.c	2017-03-31 09:15:07.979651293 +0530
-@@ -163,7 +163,7 @@
-  */
- 
- #ifdef __ANDROID__
--static char * __java_home = NULL;
-+static char * __java_home = "@TERMUX_PREFIX@/jre_runtime";
- #endif
- 
- void SetJavaHome(char *arg) {
diff --git a/termux-openjdk-aarch64-patches/getgr_r.patch b/termux-openjdk-aarch64-patches/jdk/getgr_r.patch
similarity index 82%
rename from termux-openjdk-aarch64-patches/getgr_r.patch
rename to termux-openjdk-aarch64-patches/jdk/getgr_r.patch
index 0728b06..3d13d41 100644
--- a/termux-openjdk-aarch64-patches/getgr_r.patch
+++ b/termux-openjdk-aarch64-patches/jdk/getgr_r.patch
@@ -1,5 +1,5 @@
---- ./jdk/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c	2017-03-02 21:55:47.000000000 +0530
-+++ ./jdk/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c	2017-03-03 21:37:02.370375158 +0530
+--- ./src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c	2017-03-02 21:55:47.000000000 +0530
++++ ./src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c	2017-03-03 21:37:02.370375158 +0530
 @@ -168,40 +168,6 @@
  #endif
  static fdopendir_func* my_fdopendir_func = NULL;
diff --git a/termux-openjdk-aarch64-patches/jdk/jdk-java_home.patch b/termux-openjdk-aarch64-patches/jdk/jdk-java_home.patch
new file mode 100644
index 0000000..84f81a4
--- /dev/null
+++ b/termux-openjdk-aarch64-patches/jdk/jdk-java_home.patch
@@ -0,0 +1,11 @@
+--- ./src/java.base/unix/native/libjli/java_md_solinux.c	2017-03-30 20:45:48.000000000 +0530
++++ ./src/java.base/unix/native/libjli/java_md_solinux.c	2017-03-31 09:15:07.979651293 +0530
+@@ -163,7 +163,7 @@
+  */
+ 
+ #ifdef __ANDROID__
+-static char * __java_home = NULL;
++static char * __java_home = "@TERMUX_PREFIX@/jre_runtime";
+ #endif
+ 
+ void SetJavaHome(char *arg) {
diff --git a/termux-openjdk-aarch64-patches/libpthread.patch b/termux-openjdk-aarch64-patches/jdk/libpthread.patch
similarity index 94%
rename from termux-openjdk-aarch64-patches/libpthread.patch
rename to termux-openjdk-aarch64-patches/jdk/libpthread.patch
index b8e2004..66715f8 100644
--- a/termux-openjdk-aarch64-patches/libpthread.patch
+++ b/termux-openjdk-aarch64-patches/jdk/libpthread.patch
@@ -1,5 +1,5 @@
---- ./jdk/make/lib/Awt2dLibraries.gmk	2017-03-30 20:45:48.000000000 +0530
-+++ ./jdk/make/lib/Awt2dLibraries.gmk	2017-04-02 18:36:12.582240305 +0530
+--- ./make/lib/Awt2dLibraries.gmk	2017-03-30 20:45:48.000000000 +0530
++++ ./make/lib/Awt2dLibraries.gmk	2017-04-02 18:36:12.582240305 +0530
 @@ -145,7 +145,7 @@
    LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/utility
  endif
diff --git a/termux-openjdk-aarch64-patches/osName.patch b/termux-openjdk-aarch64-patches/jdk/osName.patch
similarity index 71%
rename from termux-openjdk-aarch64-patches/osName.patch
rename to termux-openjdk-aarch64-patches/jdk/osName.patch
index d9720fe..5c2f128 100644
--- a/termux-openjdk-aarch64-patches/osName.patch
+++ b/termux-openjdk-aarch64-patches/jdk/osName.patch
@@ -1,6 +1,6 @@
 thanks @fornwall for finding this
---- ./jdk/src/java.base/unix/classes/java/lang/ProcessImpl.java	2017-03-30 20:45:48.000000000 +0530
-+++ ./jdk/src/java.base/unix/classes/java/lang/ProcessImpl.java	2017-04-01 23:04:39.565293249 +0530
+--- ./src/java.base/unix/classes/java/lang/ProcessImpl.java	2017-03-30 20:45:48.000000000 +0530
++++ ./src/java.base/unix/classes/java/lang/ProcessImpl.java	2017-04-01 23:04:39.565293249 +0530
 @@ -157,7 +157,7 @@
          static Platform get() {
              String osName = GetPropertyAction.privilegedGetProperty("os.name");
diff --git a/termux-openjdk-aarch64-patches/sendfile64.patch b/termux-openjdk-aarch64-patches/jdk/sendfile64.patch
similarity index 53%
rename from termux-openjdk-aarch64-patches/sendfile64.patch
rename to termux-openjdk-aarch64-patches/jdk/sendfile64.patch
index 58e90c7..5b0a678 100644
--- a/termux-openjdk-aarch64-patches/sendfile64.patch
+++ b/termux-openjdk-aarch64-patches/jdk/sendfile64.patch
@@ -1,5 +1,5 @@
---- ./jdk/src/java.base/unix/native/libnio/ch/FileChannelImpl.c	2017-05-12 23:48:01.000000000 +0530
-+++ ./jdk/src/java.base/unix/native/libnio/ch/FileChannelImpl.c	2017-05-14 22:51:02.292589382 +0530
+--- ./src/java.base/unix/native/libnio/ch/FileChannelImpl.c	2017-05-12 23:48:01.000000000 +0530
++++ ./src/java.base/unix/native/libnio/ch/FileChannelImpl.c	2017-05-14 22:51:02.292589382 +0530
 @@ -41,8 +41,6 @@
  #include <sys/sendfile.h>
  #ifdef __ANDROID__