diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 078ddce3ba22c529bb8c8157fb4e2773b0b63b3b..fa52c914e01ad36698a94210ce822af08f45cce5 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-17  Matthias Klose  <doko@debian.org>
+
+	* libtool-version: New.
+	* Makefile.am (libffi_la_LDFLAGS): Use -version-info for soname.
+	* Makefile.in: Regenerate.
+
 2005-06-15  Paolo Bonzini  <bonzini@gnu.org>
 
 	* Makefile.am: Remove useless multilib rules.
diff --git a/libffi/Makefile.am b/libffi/Makefile.am
index 331b5a7498b6e084b88c0385e0ac6cb521de6dd9..9506c3f4319b2537e1bc71c39c9971f5a14b16b4 100644
--- a/libffi/Makefile.am
+++ b/libffi/Makefile.am
@@ -137,7 +137,7 @@ nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
 
 AM_CFLAGS = -Wall -g -fexceptions
 
-libffi_la_LDFLAGS = -release $(VERSION)
+libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
 
 AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
 AM_CCASFLAGS = $(AM_CPPFLAGS)
diff --git a/libffi/Makefile.in b/libffi/Makefile.in
index 02bf401d15cfbd9689e2bea23bc8e8d24c1424c1..5890c8c3db1fb5c10138f9b2093d4961d0d0f3e0 100644
--- a/libffi/Makefile.in
+++ b/libffi/Makefile.in
@@ -381,7 +381,7 @@ nodist_libffi_la_SOURCES = $(am__append_1) $(am__append_2) $(am__append_3) $(am_
 libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
 nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
 AM_CFLAGS = -Wall -g -fexceptions
-libffi_la_LDFLAGS = -release $(VERSION)
+libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
 INCLUDES = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
 AM_CCASFLAGS = $(INCLUDES)
 all: fficonfig.h
diff --git a/libffi/libtool-version b/libffi/libtool-version
new file mode 100644
index 0000000000000000000000000000000000000000..f0bf8d698a24e26de2c5911ca5547bf8802ff494
--- /dev/null
+++ b/libffi/libtool-version
@@ -0,0 +1,6 @@
+# This file is used to maintain libtool version info for libffi.  See
+# the libtool manual to understand the meaning of the fields.  This is
+# a separate file so that version updates don't involve re-running
+# automake.
+# CURRENT:REVISION:AGE
+4:0:1