diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index bdd86bffa74..bccfef30349 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-07   Neil Roberts <neil@linux.intel.com>
+
+	* src/x86/sysv.S (ffi_call_SYSV): Align the stack pointer to
+	16-bytes.
+
 2010-07-02  Jakub Jelinek  <jakub@redhat.com>
 
 	* Makefile.am (AM_MAKEFLAGS): Pass also mandir to submakes.
diff --git a/libffi/src/x86/sysv.S b/libffi/src/x86/sysv.S
index 2e5e3da57f0..f3b0bd5ac52 100644
--- a/libffi/src/x86/sysv.S
+++ b/libffi/src/x86/sysv.S
@@ -48,6 +48,9 @@ ffi_call_SYSV:
 	movl  16(%ebp),%ecx
 	subl  %ecx,%esp
 
+        /* Align the stack pointer to 16-bytes */
+        andl  $0xfffffff0, %esp
+
 	movl  %esp,%eax
 
 	/* Place all of the ffi_prep_args in position  */