diff --git a/baselibs.conf b/baselibs.conf
index 77a1c50..3b15918 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,3 +1,3 @@
-libnettle4
+libnettle6
 libnettle-devel
-libhogweed2
+libhogweed4
diff --git a/libnettle.changes b/libnettle.changes
index e249857..512a5a8 100644
--- a/libnettle.changes
+++ b/libnettle.changes
@@ -1,3 +1,46 @@
+-------------------------------------------------------------------
+Sat Apr 11 19:43:21 UTC 2015 - astieger@suse.com
+
+- nettle 3.1 (libnettle6, libhogweed4)
+- bug fixes in 3.1:
+  * Fixed a missing include of <limits.h>, which made the camellia
+    implementation fail on all 64-bit non-x86 platforms.
+  * Eliminate out-of-bounds reads in the C implementation of memxor
+   (related to valgrind's --partial-loads-ok flag). [bso#926745)
+- interface changes in 3.1:
+  * Declarations of many internal functions are moved from ecc.h to
+    ecc-internal.h.
+- interface changes in 3.0:
+  * contains developer relevant incompatible interface changes
+- Removed features:
+  * nettle_next_prime, use GMP's mpz_nextprime
+  * Deleted the RSAREF compatibility
+- New features in 3.1:
+  * Support for curve25519 and for EdDSA25519 signatures.
+  * Support for "fat builds" on x86_64 and arm (not enabled)
+  * Support for building the hogweed library (public key support)
+    using "mini-gmp" (not enabled)
+  * The shared libraries are now built with versioned symbols.
+  * Support for "URL-safe" base64 encoding and decoding
+- New features in 3.0:
+  * new DSA, AES, Camellia interfaces
+  * Support for Poly1305-AES MAC.
+  * Support for the ChaCha stream cipher and EXPERIMENTAL
+    support for the ChaCha-Poly1305 AEAD mode.
+  * Support for EAX mode.
+  * Support for CCM mode.
+  * Additional variants of SHA512 with output size of 224 and 256 bits
+  * New interface, struct nettle_aead, for mechanisms providing
+    authenticated encryption with associated data (AEAD).
+  * DSA: Support a wider range for the size of q and a wider
+    range for the digest size.
+  * New command line tool nettle-pbkdf2.
+- Optimizations in 3.1:
+  * New x86_64 implementation of AES, using the "aesni" instructions
+- Optimizations in 3.0:
+   * New x86_64 assembly for GCM and MD5. Modest speedups on the
+     order of 10%-20%.
+
 -------------------------------------------------------------------
 Fri Mar 13 14:10:01 UTC 2015 - tchvatal@suse.com
 
diff --git a/libnettle.spec b/libnettle.spec
index fd91c58..6d05a82 100644
--- a/libnettle.spec
+++ b/libnettle.spec
@@ -16,17 +16,17 @@
 #
 
 
-%define soname 4
-%define hogweed_soname 2
+%define soname 6
+%define hogweed_soname 4
 Name:           libnettle
-Version:        2.7.1
+Version:        3.1
 Release:        0
 Summary:        Cryptographic Library
 License:        LGPL-2.1+ and GPL-2.0+
 Group:          System/Libraries
 Url:            http://www.lysator.liu.se/~nisse/nettle/
-Source0:        http://www.lysator.liu.se/~nisse/archive/nettle-%{version}.tar.gz
-Source1:        http://www.lysator.liu.se/~nisse/archive/nettle-%{version}.tar.gz.sig
+Source0:        https://ftp.gnu.org/gnu/nettle/nettle-%{version}.tar.gz
+Source1:        https://ftp.gnu.org/gnu/nettle/nettle-%{version}.tar.gz.sig
 Source2:        %{name}.keyring
 Source3:        baselibs.conf
 BuildRequires:  gmp-devel
@@ -93,13 +93,12 @@ operations using the nettle library.
 %setup -q -n nettle-%{version}
 
 %build
-%configure
+%configure \
+	--disable-static
 make %{?_smp_mflags}
 
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
-# Not during configure as tests use it
-rm -f %{buildroot}%{_libdir}/*.a
 
 %post   -n libnettle%{soname} -p /sbin/ldconfig
 
@@ -142,6 +141,7 @@ make check %{?_smp_mflags}
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING* NEWS README TODO
 %{_bindir}/nettle-lfib-stream
+%{_bindir}/nettle-pbkdf2
 %{_bindir}/pkcs1-conv
 %{_bindir}/sexp-conv
 %{_bindir}/nettle-hash
diff --git a/nettle-2.7.1.tar.gz b/nettle-2.7.1.tar.gz
deleted file mode 100644
index eae0001..0000000
--- a/nettle-2.7.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bc71ebd43435537d767799e414fce88e521b7278d48c860651216e1fc6555b40
-size 1558863
diff --git a/nettle-2.7.1.tar.gz.sig b/nettle-2.7.1.tar.gz.sig
deleted file mode 100644
index ff71c67..0000000
Binary files a/nettle-2.7.1.tar.gz.sig and /dev/null differ
diff --git a/nettle-3.1.tar.gz b/nettle-3.1.tar.gz
new file mode 100644
index 0000000..e2b777b
--- /dev/null
+++ b/nettle-3.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f6859d4ec88e70805590af9862b4b8c43a2d1fc7991df0a7a711b1e7ca9fc9d3
+size 1851489
diff --git a/nettle-3.1.tar.gz.sig b/nettle-3.1.tar.gz.sig
new file mode 100644
index 0000000..b9f4374
Binary files /dev/null and b/nettle-3.1.tar.gz.sig differ