diff --git a/.gitmodules b/.gitmodules
index fd11f34a2..711d89da6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "ext/ffi_c/libffi"]
 	path = ext/ffi_c/libffi
-	url = https://github.com/libffi/libffi.git
+	url = https://github.com/larskanis/libffi.git
+	branch = fix-stdcall
diff --git a/ext/ffi_c/libffi b/ext/ffi_c/libffi
index b55baf0b5..024800a13 160000
--- a/ext/ffi_c/libffi
+++ b/ext/ffi_c/libffi
@@ -1 +1 @@
-Subproject commit b55baf0b500ccc7636a8a55e0506d9da787ad2dd
+Subproject commit 024800a1331d38794c24cf191cd74b70af1078a1