diff --git a/JDK-8196221-mistake-in-8195859.patch b/JDK-8196221-mistake-in-8195859.patch
new file mode 100644
index 0000000..d9975c9
--- /dev/null
+++ b/JDK-8196221-mistake-in-8195859.patch
@@ -0,0 +1,22 @@
+# HG changeset patch
+# User adinn
+# Date 1516984701 0
+#      Fri Jan 26 16:38:21 2018 +0000
+# Node ID 2c35f60ad26425a6d1dd1071e8a5adde79154fe3
+# Parent  e2a7856edfbaccebd36bf02674e39b1a53867241
+8196221: AArch64: Mistake in committed patch for JDK-8195859
+Summary:  The wrong patch was committed for JDK-8195859
+Reviewed-by: duke
+
+diff --git a/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp b/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
+--- a/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
++++ b/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
+@@ -1050,7 +1050,7 @@
+   } else {
+     vtable_offset_in_bytes += vtable_index.as_constant() * wordSize;
+     ldr(method_result,
+-        form_address(rscratch1, recv_klass, vtable_offset_in_bytes));
++        form_address(rscratch1, recv_klass, vtable_offset_in_bytes, 0));
+   }
+ }
+ 
diff --git a/java-9-openjdk.spec b/java-9-openjdk.spec
index ef605f2..d0a6913 100644
--- a/java-9-openjdk.spec
+++ b/java-9-openjdk.spec
@@ -938,9 +938,11 @@ Patch401: aarch64BuildFailure.patch
 # JDK-8195685 AArch64 cannot build with JDK-8174962
 # JDK-8196136 AArch64: Correct register use in patch for JDK-8195685
 # JDK-8195859 AArch64: vtableStubs gtest fails after 8174962
+# JDK-8196221 AArch64: Mistake in committed patch for JDK-8195859
 Patch402: JDK-8195685-cannot-build-with-8174962.patch
 Patch403: JDK-8196136-correct-register-use-8195685.patch
 Patch404: JDK-8195859-vtableStubs-gtest-fails-after-8174962.patch
+Patch405: JDK-8196221-mistake-in-8195859.patch
 
 # Non-OpenJDK fixes
 Patch1000: enableCommentedOutSystemNss.patch
@@ -1253,6 +1255,7 @@ pushd hotspot
 %patch402 -p1
 %patch403 -p1
 %patch404 -p1
+%patch405 -p1
 popd
 
 popd # openjdk