diff --git a/Programming/Java/10u44/variants b/Programming/Java/10u44/variants
new file mode 100644
index 0000000..6eccb62
--- /dev/null
+++ b/Programming/Java/10u44/variants
@@ -0,0 +1,2 @@
+Java/10u44 unstable
+Java/10.0.44 removed
diff --git a/Programming/Java/12.0.2/variants b/Programming/Java/12.0.2/variants
deleted file mode 100644
index c67ef1b..0000000
--- a/Programming/Java/12.0.2/variants
+++ /dev/null
@@ -1 +0,0 @@
-Java/12.0.2   stable
diff --git a/Programming/Java/12u2/variants b/Programming/Java/12u2/variants
new file mode 100644
index 0000000..f6c2e4a
--- /dev/null
+++ b/Programming/Java/12u2/variants
@@ -0,0 +1,2 @@
+Java/12u2   stable
+Java/12.0.2 deprecated
diff --git a/Programming/Java/15u36/variants b/Programming/Java/15u36/variants
new file mode 100644
index 0000000..09f361a
--- /dev/null
+++ b/Programming/Java/15u36/variants
@@ -0,0 +1 @@
+Java/15u36 unstable
diff --git a/Programming/Java/build b/Programming/Java/build
old mode 100644
new mode 100755
index 7589acb..2dd9e71
--- a/Programming/Java/build
+++ b/Programming/Java/build
@@ -1,6 +1,10 @@
 #!/usr/bin/env modbuild 
 
-pbuild::set_download_url "https://download.java.net/java/GA/jdk12.0.2/e482c34c86bd4bf8b56c0b35558996b9/10/GPL/openjdk-12.0.2_linux-x64_bin.tar.gz"
+URL=$(grep -E "^${V_MAJOR}" files/version-to-URL.txt | awk '{print $2}')
+
+echo $URL
+
+pbuild::set_download_url "${URL}"
 
 pbuild::add_to_group 'Programming'
 
@@ -13,33 +17,7 @@ pbuild::compile() {
 }
 
 pbuild::install() {
-  install -m 0755 -d "${PREFIX}/bin"
-  for binary_file in $(ls ${SRC_DIR}/bin/*)
-  do
-    install -m 0755 "${binary_file}" "${PREFIX}/bin"
-  done
-
-  for java_dir in $(echo "lib lib/security lib/jfr lib/server")
-  do
-    mkdir -p "${PREFIX}/${java_dir}"
-    install -m 0755 -d "${PREFIX}/${java_dir}"
-    for library_file in $(find ${SRC_DIR}/${java_dir} -maxdepth 1 -type f)
-    do
-      install -m 0755 "${library_file}" "${PREFIX}/${java_dir}"
-    done
-  done
-
-  for java_dir in $(echo "conf conf/management conf/security conf/security/policy conf/security/policy/unlimited conf/security/policy/limited conf/sdp")
-  do
-    mkdir -p "${PREFIX}/${java_dir}"
-    install -m 0755 -d "${PREFIX}/${java_dir}"
-    for library_file in $(find ${SRC_DIR}/${java_dir} -maxdepth 1 -type f)
-    do
-      install -m 0755 "${library_file}" "${PREFIX}/${java_dir}"
-    done
-  done
-
-  for java_dir in $(echo "jmods")
+  for java_dir in $(find ${SRC_DIR} -type d | sed -n "s|^${SRC_DIR}/||p")
   do
     mkdir -p "${PREFIX}/${java_dir}"
     install -m 0755 -d "${PREFIX}/${java_dir}"
diff --git a/Programming/Java/files/version-to-URL.txt b/Programming/Java/files/version-to-URL.txt
new file mode 100644
index 0000000..5854f9e
--- /dev/null
+++ b/Programming/Java/files/version-to-URL.txt
@@ -0,0 +1,3 @@
+10u44  https://download.java.net/openjdk/jdk10/ri/openjdk-10+44_linux-x64_bin_ri.tar.gz
+12u2   https://download.java.net/java/GA/jdk12.0.2/e482c34c86bd4bf8b56c0b35558996b9/10/GPL/openjdk-12.0.2_linux-x64_bin.tar.gz
+15u36  https://download.java.net/java/GA/jdk15/779bf45e88a44cbd9ea6621d33e33db1/36/GPL/openjdk-15_linux-aarch64_bin.tar.gz