diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index b25ef5b8d8b819a4cfbc69246ac9e1897b639be4..d6a0b51a275beca26b48b034cbac61ac8e53126b 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-02  Richard Henderson  <rth@redhat.com>
+
+	* libtool-version: Increase to 7:0:0.
+	* libffi.map.in: Increase version numbers to 7.0.
+
 2016-03-03  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* Makefile.am (libffi.map-sun): Properly convert
diff --git a/libffi/libffi.map.in b/libffi/libffi.map.in
index ca509671a8038f79c2d4848249c29371d9ea5948..8bd27ef693ab28755ffa0261cc6f32021dd20688 100644
--- a/libffi/libffi.map.in
+++ b/libffi/libffi.map.in
@@ -3,7 +3,7 @@
 #include <fficonfig.h>
 #include <ffitarget.h>
 
-LIBFFI_BASE_5 {
+LIBFFI_BASE_7.0 {
   global:
 	/* Exported data variables.  */
 	ffi_type_void;
@@ -46,17 +46,17 @@ LIBFFI_BASE_5 {
 };
 
 #ifdef FFI_TARGET_HAS_COMPLEX_TYPE
-LIBFFI_COMPLEX_5 {
+LIBFFI_COMPLEX_7.0 {
   global:
 	/* Exported data variables.  */
 	ffi_type_complex_float;
 	ffi_type_complex_double;
 	ffi_type_complex_longdouble;
-} LIBFFI_BASE_5;
+} LIBFFI_BASE_7.0;
 #endif
 
 #if FFI_CLOSURES
-LIBFFI_CLOSURE_5 {
+LIBFFI_CLOSURE_7.0 {
   global:
 	ffi_closure_alloc;
 	ffi_closure_free;
@@ -66,13 +66,13 @@ LIBFFI_CLOSURE_5 {
 	ffi_prep_raw_closure_loc;
 	ffi_prep_java_raw_closure;
 	ffi_prep_java_raw_closure_loc;
-} LIBFFI_BASE_5;
+} LIBFFI_BASE_7.0;
 #endif
 
 #if FFI_GO_CLOSURES
-LIBFFI_GO_CLOSURE_5 {
+LIBFFI_GO_CLOSURE_7.0 {
   global:
 	ffi_call_go;
 	ffi_prep_go_closure;
-} LIBFFI_CLOSURE_5;
+} LIBFFI_CLOSURE_7.0;
 #endif
diff --git a/libffi/libtool-version b/libffi/libtool-version
index 0a841ca23be133c3ec9b41ea0704e63a130e8dec..dfb8b111d0bd757a683a4a11558dadfac55835ab 100644
--- a/libffi/libtool-version
+++ b/libffi/libtool-version
@@ -3,4 +3,4 @@
 # a separate file so that version updates don't involve re-running
 # automake.
 # CURRENT:REVISION:AGE
-5:0:0
+7:0:0