diff --git a/.gitignore b/.gitignore
index cf8dea6..9fd9ce2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/givaro-3.7.2.tar.gz
 /givaro-3.8.0.tar.gz
+/v4.0.1.tar.gz
diff --git a/givaro-config-script.patch b/givaro-config-script.patch
deleted file mode 100644
index 7e29385..0000000
--- a/givaro-config-script.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- givaro-config.in	2014-01-30 09:27:47.000000000 -0700
-+++ givaro-config.in.new	2014-09-18 20:00:00.000000000 -0600
-@@ -74,11 +74,11 @@
- 	;;
- 
-     --cflags)
--       	echo -I${includedir} @GMP_CFLAGS@
-+       	echo -n " -I${includedir} @GMP_CFLAGS@"
- 	;;
- 
-     --libs)
--       	echo -L${libdir} -lgivaro @GMP_LIBS@ 
-+       	echo -n " -L${libdir} -lgivaro @GMP_LIBS@"
-        	;;
- 
-     *)
diff --git a/givaro.spec b/givaro.spec
index c07a391..c9a5ff2 100644
--- a/givaro.spec
+++ b/givaro.spec
@@ -1,20 +1,18 @@
 Name:		givaro
-Version:	3.8.0
-Release:	5%{?dist}
+Version:	4.0.1
+Release:	1%{?dist}
 Summary:	C++ library for arithmetic and algebraic computations
-Group:		Development/Libraries
 
 License:	CeCILL-B
-URL:		http://ljk.imag.fr/CASYS/LOGICIELS/givaro/
-Source0:	https://forge.imag.fr/frs/download.php/592/%{name}-%{version}.tar.gz
-# Avoid a spurious newline when configuring with both --cflags and --libs
-Patch0:		givaro-config-script.patch
+URL:		http://givaro.forge.imag.fr/
+Source0:	https://github.com/linbox-team/%{name}/archive/v%{version}.tar.gz
 
-BuildRequires:	doxygen
-BuildRequires:  ghostscript
+BuildRequires:	doxygen-latex
+BuildRequires:	gcc-c++
+BuildRequires:	ghostscript-core
 BuildRequires:	gmp-devel
-BuildRequires:	tex(latex)
-BuildRequires:  tex(stmaryrd.sty)
+BuildRequires:	libtool
+BuildRequires:	tex(stmaryrd.sty)
 
 
 %description
@@ -30,44 +28,27 @@ univariate polynomials (and therefore recursive multivariate).
 
 %package        devel
 Summary:	Files useful for %{name} development
-Group:		Development/Libraries
 Requires:	%{name}%{?_isa} = %{version}-%{release}
 Provides:	bundled(jquery)
 
+# This can be removed when Fedora 23 reaches EOL
+Obsoletes:      %{name}-static < 4.0.0
+Provides:       %{name}-static = %{version}-%{release}
+
 
 %description    devel
 The libraries and header files for using %{name} for development.
 
 
-%package        static
-Summary:	Files used for static linking with %{name}
-Group:		Development/Libraries
-Requires:	%{name}%{?_isa} = %{version}-%{release}
-Requires:	%{name}-devel%{?_isa} = %{version}-%{release}
-
-
-%description    static
-The static libraries for using %{name} for development.
-
-
 %prep
 %setup -q
-%patch0
 
-# Fix file encodings
-for i in Licence_CeCILL-B_V1-fr.txt Licence_CeCILL-B_V1-en.txt COPYING AUTHORS;
-do
-	iconv -f iso8859-1 -t utf-8 $i > $i.new
-	touch -r $i $i.new
-	mv $i.new $i
-done
-
-# Remove unnecessary executable bits
-find examples -name Makefile.am -perm /0111 | xargs chmod a-x
+# Upstream no longer ships the configure script
+autoreconf -fi
 
 %build
-%configure --enable-doc --docdir=%{_docdir}/%{name}-devel \
-  CPPFLAGS="-D__int64=__int64_t"
+%configure --disable-static --enable-doc --docdir=%{_docdir}/%{name}-devel
+chmod a+x givaro-config
 
 # Get rid of undesirable hardcoded rpaths, and workaround libtool reordering
 # -Wl,--as-needed after all the libraries.
@@ -83,20 +64,18 @@ rm -f docs/givaro-html/{AUTHORS,COPYING,INSTALL}
 
 
 %install
-# Documentation installation is hopelessly broken
-sed -i 's/^SUBDIRS =.*/SUBDIRS = src macros tests/' Makefile
+make install DESTDIR=%{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la
+# We don't want libtool archives
+rm -f %{buildroot}%{_libdir}/lib%{name}.la
 
-#givaro-makefile is installed incorrectly in usr/bin
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
-mv $RPM_BUILD_ROOT/%{_bindir}/givaro-makefile $RPM_BUILD_ROOT%{_datadir}/%{name}
-chmod 644  $RPM_BUILD_ROOT%{_datadir}/%{name}/givaro-makefile
-sed -i '\%#! /bin/sh%D' $RPM_BUILD_ROOT%{_datadir}/%{name}/givaro-makefile
+# Documentation is installed in the wrong place
+mkdir -p %{buildroot}%{_docdir}
+mv %{buildroot}%{_prefix}/docs %{buildroot}%{_docdir}/%{name}-devel
 
 
 %check
+export LD_LIBRARY_PATH=$PWD/src/.libs
 make check
 
 
@@ -108,25 +87,26 @@ make check
 
 %files
 %doc AUTHORS
-%license COPYRIGHT COPYING Licence_CeCILL-B_V1-en.txt Licence_CeCILL-B_V1-fr.txt
+%license COPYRIGHT Licence_CeCILL-B_V1-en.txt Licence_CeCILL-B_V1-fr.txt
 %{_libdir}/lib%{name}.so.*
 
 
 %files devel
-%doc docs/givaro-html docs/givaro-dev-html examples
+%{_docdir}/%{name}-devel/
 %{_bindir}/%{name}-config
+%{_bindir}/%{name}-makefile
 %{_includedir}/%{name}/
 %{_includedir}/gmp++/
-%{_datadir}/%{name}/
+%{_includedir}/recint/
 %{_includedir}/%{name}-config.h
 %{_libdir}/lib%{name}.so
-
-
-%files static
-%{_libdir}/lib%{name}.a
+%{_libdir}/pkgconfig/%{name}.pc
 
 
 %changelog
+* Fri Feb 26 2016 Jerry James <loganjerry@gmail.com> - 4.0.1-1
+- New upstream release
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index f1d02d1..c4683ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6ba1a4672a5d434d2502d17db30c86e5  givaro-3.8.0.tar.gz
+00b90cad7929fdaa4eedf6cef009bfbb  v4.0.1.tar.gz