--- old/common/conf/jib-profiles.js	2016-03-30 12:04:12.787558529 +0200
+++ new/common/conf/jib-profiles.js	2016-03-30 12:04:12.703555019 +0200
@@ -256,6 +256,17 @@
             make_args: common.make_args
         },
 
+        "linux-arm64": {
+            target_os: "linux",
+            target_cpu: "aarch64",
+            build_cpu: "x64",
+            dependencies: concat(common.dependencies, "devkit", "build_devkit", "cups",
+                "headless_stubs", "freetype"),
+            configure_args: concat(common.configure_args,
+                [ "--with-jvm-variants=server", "--openjdk-target=aarch64-linux-gnu" ]),
+            make_args: common.make_args
+        },
+
         "macosx-x64": {
             target_os: "macosx",
             target_cpu: "x64",
@@ -357,6 +368,7 @@
 
     var devkit_platform_revisions = {
         linux_x64: "gcc4.9.2-OEL6.4+1.0",
+        linux_aarch64: "gcc-linaro-aarch64-linux-gnu-4.8-2013.11_linux+1.0",
         macosx_x64: "Xcode6.3-MacOSX10.9+1.0",
         solaris_x64: "SS12u4-Solaris11u1+1.0",
         solaris_sparcv9: "SS12u4-Solaris11u1+1.0",
@@ -432,6 +444,18 @@
             ext: "tar.gz",
             revision: "2.3.4+1.0",
             module: "freetype-" + input.target_platform
+        },
+
+        headless_stubs: {
+            organization: common.organization,
+            ext: "tar.gz",
+            revision: "1.0",
+            module: "headless-stubs-" + input.target_platform,
+            configure_args: [
+                "--with-alsa=" + input.get("headless_stubs", "install_path") + "/alsa",
+                "--x-includes=" + input.get("headless_stubs", "install_path") + "/X11/include",
+                "--x-libraries=" + input.get("headless_stubs", "install_path") + "/X11/lib"
+            ]
         }
     };
 
--- old/make/jprt.properties	2016-03-30 12:04:13.175574741 +0200
+++ new/make/jprt.properties	2016-03-30 12:04:13.095571399 +0200
@@ -80,6 +80,7 @@
 # Setup jib profiles
 jprt.linux_i586.product.build.jib.profile=linux-x86
 jprt.linux_x64.product.build.jib.profile=linux-x64
+jprt.linux_arm64.product.build.jib.profile=linux-arm64
 jprt.macosx_x64.product.build.jib.profile=macosx-x64
 jprt.solaris_sparcv9.product.build.jib.profile=solaris-sparcv9
 jprt.solaris_x64.product.build.jib.profile=solaris-x64
@@ -88,6 +89,7 @@
 
 jprt.linux_i586.fastdebug.build.jib.profile=linux-x86-debug
 jprt.linux_x64.fastdebug.build.jib.profile=linux-x64-debug
+jprt.linux_arm64.fastdebug.build.jib.profile=linux-arm64-debug
 jprt.macosx_x64.fastdebug.build.jib.profile=macosx-x64-debug
 jprt.solaris_sparcv9.fastdebug.build.jib.profile=solaris-sparcv9-debug
 jprt.solaris_x64.fastdebug.build.jib.profile=solaris-x64-debug
@@ -96,6 +98,7 @@
 
 jprt.linux_i586.slowdebug.build.jib.profile=linux-x86-slowdebug
 jprt.linux_x64.slowdebug.build.jib.profile=linux-x64-slowdebug
+jprt.linux_arm64.slowdebug.build.jib.profile=linux-arm64-slowdebug
 jprt.macosx_x64.slowdebug.build.jib.profile=macosx-x64-slowdebug
 jprt.solaris_sparcv9.slowdebug.build.jib.profile=solaris-sparcv9-slowdebug
 jprt.solaris_x64.slowdebug.build.jib.profile=solaris-x64-slowdebug
@@ -104,6 +107,7 @@
 
 jprt.linux_i586.productOpen.build.jib.profile=linux-x86-open
 jprt.linux_x64.productOpen.build.jib.profile=linux-x64-open
+jprt.linux_arm64.productOpen.build.jib.profile=linux-arm64-open
 jprt.macosx_x64.productOpen.build.jib.profile=macosx-x64-open
 jprt.solaris_sparcv9.productOpen.build.jib.profile=solaris-sparcv9-open
 jprt.solaris_x64.productOpen.build.jib.profile=solaris-x64-open
@@ -112,6 +116,7 @@
 
 jprt.linux_i586.fastdebugOpen.build.jib.profile=linux-x86-open-debug
 jprt.linux_x64.fastdebugOpen.build.jib.profile=linux-x64-open-debug
+jprt.linux_arm64.fastdebugOpen.build.jib.profile=linux-arm64-open-debug
 jprt.macosx_x64.fastdebugOpen.build.jib.profile=macosx-x64-open-debug
 jprt.solaris_sparcv9.fastdebugOpen.build.jib.profile=solaris-sparcv9-open-debug
 jprt.solaris_x64.fastdebugOpen.build.jib.profile=solaris-x64-open-debug
@@ -495,6 +500,7 @@
     solaris_x64_5.11-{product|fastdebug|slowdebug}, \
     linux_i586_3.8-{product|fastdebug|slowdebug}, \
     linux_x64_3.8-{product|fastdebug|slowdebug}, \
+    linux_arm64_2.6-{product|fastdebug|slowdebug}, \
     macosx_x64_10.9-{product|fastdebug|slowdebug}, \
     windows_i586_6.3-{product|fastdebug|slowdebug}, \
     windows_x64_6.3-{product|fastdebug|slowdebug}, \