diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index d01a4dd06a2f69cdeddd30b3f2d581d10ead2177..61b0b4f43f434843baa9fe65c659a05acf042d5c 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-10  Andrew Haley  <aph@redhat.com>
+
+	* src/x86/ffi64.c (ffi_prep_args ): 8-align all stack arguments.
+
 2004-08-01  Robert Millan  <robertmh@gnu.org>
 
 	* configure.ac: Detect knetbsd-gnu and kfreebsd-gnu.
diff --git a/libffi/src/x86/ffi64.c b/libffi/src/x86/ffi64.c
index 343ee925fde707f999ac2c30abae35662bc596ae..653d45c243a8da71cba4c1b751fb43edbe838204 100644
--- a/libffi/src/x86/ffi64.c
+++ b/libffi/src/x86/ffi64.c
@@ -341,6 +341,8 @@ ffi_prep_args (stackLayout *stack, extended_cif *ecif)
 	{
 	  /* Pass this argument in memory.  */
 	  argp = (void *)ALIGN(argp, (*p_arg)->alignment);
+	  /* Stack arguments are *always* at least 8 byte aligned.  */
+	  argp = (void *)ALIGN(argp, 8);
 	  memcpy (argp, *p_argv, (*p_arg)->size);
 	  argp += (*p_arg)->size;
 	}