--- old/src/java.base/share/classes/java/nio/Bits.java	2015-02-13 13:34:24.384646678 +0000
+++ new/src/java.base/share/classes/java/nio/Bits.java	2015-02-13 13:34:24.064678438 +0000
@@ -614,7 +614,8 @@
         String arch = AccessController.doPrivileged(
             new sun.security.action.GetPropertyAction("os.arch"));
         unaligned = arch.equals("i386") || arch.equals("x86")
-            || arch.equals("amd64") || arch.equals("x86_64");
+            || arch.equals("amd64") || arch.equals("x86_64")
+            || arch.equals("aarch64");
         unalignedKnown = true;
         return unaligned;
     }
--- old/src/java.base/share/classes/sun/security/provider/ByteArrayAccess.java	2015-02-13 13:34:25.894496810 +0000
+++ new/src/java.base/share/classes/sun/security/provider/ByteArrayAccess.java	2015-02-13 13:34:25.574528570 +0000
@@ -94,7 +94,7 @@
         String arch = java.security.AccessController.doPrivileged
             (new sun.security.action.GetPropertyAction("os.arch", ""));
         return arch.equals("i386") || arch.equals("x86") || arch.equals("amd64")
-            || arch.equals("x86_64");
+            || arch.equals("x86_64") || arch.equals("aarch64");
     }
 
     /**