diff --git a/givaro-4.0.0.tar.gz b/givaro-4.0.0.tar.gz
deleted file mode 100644
index 2ae2687..0000000
--- a/givaro-4.0.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:10c393ef9bb5eb7bf3809134a65d0815e7583de55514b56c6532d07ce50883f6
-size 920437
diff --git a/givaro.changes b/givaro.changes
index 53efc1f..4872666 100644
--- a/givaro.changes
+++ b/givaro.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Mar 12 21:33:59 UTC 2016 - jengelh@inai.de
+
+- Update to new upstream release 4.0.1
+* This release is compatible with fflas-ffpack-2.2.0 and
+  linbox-1.4.0.
+* Add pkgconfig file for givaro
+
 -------------------------------------------------------------------
 Sat Nov 14 10:21:24 UTC 2015 - jengelh@inai.de
 
diff --git a/givaro.spec b/givaro.spec
index 1f6b0f3..2d5f552 100644
--- a/givaro.spec
+++ b/givaro.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package givaro
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,10 +17,8 @@
 
 
 Name:           givaro
-%define lname   libgivaro8
-# givaro failed to update the SONAME in the past; continue verifying it
-# moves in the future as needed.
-Version:        4.0.0
+%define lname   libgivaro-4_0_1
+Version:        4.0.1
 Release:        0
 Summary:        C++ library for arithmetic and algebraic computations
 License:        CECILL-B
@@ -29,17 +27,17 @@ Url:            http://givaro.forge.imag.fr/
 
 #Git-Web:	https://github.com/linbox-team/givaro
 #Git-Clone:	git://github.com/linbox-team/givaro
-# For every version, the damn link changes. The basename is ignored, but what
-# matters to the FRS is the file ID after "download.php". For example, /370
-# will always pull givaro-3.7.2.tar.gz.
-Source:         https://forge.imag.fr/frs/download.php/672/givaro-4.0.0.tar.gz
+Source:         https://github.com/linbox-team/givaro/archive/v4.0.1.tar.gz
 Patch1:         givaro-doc-no-build-time.patch
+Patch2:         new-abi.diff
 # Old doxygen does not properly handle symlink recursion
 BuildRequires:  doxygen >= 1.5.7.1
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  gmp-devel >= 3.1.1
 BuildRequires:  graphviz
+BuildRequires:  libtool >= 2.2
+BuildRequires:  pkg-config
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -109,11 +107,13 @@ the Givaro API.
 
 %prep
 %setup -q
-%patch1 -p1
+%patch -P 1 -P 2 -p1
 
 %build
+autoreconf -fi
 %configure --disable-static --enable-doc --with-docdir="%_docdir/%name" \
 	--enable-silent-rules
+chmod a+x givaro-config
 make %{?_smp_mflags}
 
 %install
@@ -127,7 +127,7 @@ rm -f "$b/%_libdir"/*.la
 
 %files -n %lname
 %defattr(-,root,root)
-%_libdir/libgivaro.so.8*
+%_libdir/libgivaro-4.0.1.so
 %doc COPYRIGHT COPYING
 
 %files devel
@@ -139,6 +139,7 @@ rm -f "$b/%_libdir"/*.la
 %_includedir/gmp++/
 %_includedir/recint/
 %_libdir/libgivaro.so
+%_libdir/pkgconfig/givaro.pc
 
 %files doc
 %defattr(-,root,root)
diff --git a/new-abi.diff b/new-abi.diff
new file mode 100644
index 0000000..2f7dccd
--- /dev/null
+++ b/new-abi.diff
@@ -0,0 +1,22 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2016-03-12 22:24:06.376559254 +0100
+References: https://github.com/linbox-team/givaro/issues/7
+
+Since upstream did not get it right, use -release as per the
+tips in the openSUSE wiki on how to tackle that problem.
+---
+ src/Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: givaro-4.0.1/src/Makefile.am
+===================================================================
+--- givaro-4.0.1.orig/src/Makefile.am
++++ givaro-4.0.1/src/Makefile.am
+@@ -20,6 +20,6 @@ libgivaro_la_LIBADD= \
+ 	kernel/gmp++/libgmppp.la kernel/bstruct/libgivbstruct.la kernel/integer/libgivinteger.la kernel/memory/libgivmemory.la kernel/rational/libgivrational.la kernel/system/libgivsystem.la kernel/field/libgivfield.la library/tools/libgivtools.la library/poly1/libgivpoly1.la
+ 
+ # soname of libgivaro
+-libgivaro_la_LDFLAGS = -version-info 8:1:0
++libgivaro_la_LDFLAGS = -release ${PACKAGE_VERSION}
+ libgivaro_la_LDFLAGS+= -no-undefined
+ libgivaro_la_LDFLAGS+=$(LDFLAGS)
diff --git a/v4.0.1.tar.gz b/v4.0.1.tar.gz
new file mode 100644
index 0000000..b18a474
--- /dev/null
+++ b/v4.0.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:304cea7aaee0e4282c3a6a248dcfe1abb6d30eae6cc6c2f316de4da1cedaede9
+size 637821