diff --git a/.gitignore b/.gitignore
index 1ba2e99..d363990 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/cryptsetup-1.6.8.tar.xz
+/cryptsetup-1.7.0.tar.xz
diff --git a/cryptsetup-1.6.8.tar.sign b/cryptsetup-1.6.8.tar.sign
deleted file mode 100644
index aa20cd3..0000000
--- a/cryptsetup-1.6.8.tar.sign
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABCAAGBQJV7r+oAAoJENmwV3vZPpj8KEsP/2BTTiaXCzwvqupSAo7dFpET
-Tugtc99Nzrv8Yc4nNvboxXSD7/TOZYAEWz787KPANJo3Ks46F3BB9KjeqRxhnGAX
-+Ce9wi8ufdjECSZjNDxl5tcJrmrmftAgBbZhPIaYE7wZuxF71Cl769XHdgVvSV2w
-pyGbiqXdcnMVw1q4npndZNsVoMZ4vB1bEfz8AAgC6idF/yiAw2tI7VjUZfrNDd0b
-mc6IOmDslyGxA1565w/HSiZqxqaZTsVGfwfluxTwpu+Du9eMHeViJV/4Z1Aka5lF
-wNxnJZro9UlGkRCWXR6zZYXPrHEHGaNlwObUpWcfHSLNTP9ulgPY0tkVnXuY7uom
-JGtGCdVPsqxCaBg8fd+QQRbPZqrIZGw+wgjikqTs9gnd+LdUBxHDuseRuE+mkk0w
-cZW2RQf9f4nYj7LUvLuY0NBQ9brHsrU/IqjWQWnPrzmdCh2pdnb6UmOyWH0dcYcB
-ldReYWbbCBO132QZuT53VJv/c4XATnEQLIgOaT3AUddVUAEvkNephesN1/rjuAKG
-OwTVelvo4gp0ncYPZiQHzkVe5mTt/7JVyuXYDO/tnm4JYn9ZFQj00ZoGTeywWAGR
-5xNH7Gjo8JGNm9oI358jfQw6zLBWn3FdyDgoxxvupNC6wi/O+7Gb86PxyMFn7Lii
-sF1YN0no4oN+OyCDU17N
-=apNw
------END PGP SIGNATURE-----
diff --git a/cryptsetup-1.7.0.tar.sign b/cryptsetup-1.7.0.tar.sign
new file mode 100644
index 0000000..920afad
--- /dev/null
+++ b/cryptsetup-1.7.0.tar.sign
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABCAAGBQJWOKq0AAoJENmwV3vZPpj8VfgQALqERsJKR9EYJMjsZrij0cEO
+gsy3CJ2zLo8vWBy0GakfH67fKCDxpoMCDKT2B76DJmAkQbaEJULZeaIxA+gQrjWj
+Kg5HrzKjzwbnN8Cv6Wp/rhSK6GS943KO8DMu/lw3SjTEqp9lqySDE5ISwYIqOMS+
+0qr3UpPpJTt6vaMDrDEUvUTGzfV1cK4nvRjrw9nXSbnDpYr4N1PXGoT9eFKIJp8Y
+LV/2esfC1P4y2/qm7Tx1ptOsiv9EAZitWtD7IqPgRbHsLvpO+W41OP5bnRtXTK3/
+RHBYQpKrR5uChLItI457/TYRK4ucxn25AjF/8rXoKgqNaE9ZC1+a1RRjxQqFqIIc
+CtkwUWN9BL0y78jmz+DSn/B/YB18KesraUMkobmsxRVzea7Vzcbv/lcfwBVIkjMH
+DKFJJSRDWa1Zuvola+uW/gvEQuELBQkqe6IErn8WhMN2u35YjQ7r1N6f2If4SvF1
+c/W8mgC/tV+L5v9THSGMjv4VZ/GMaFSq2zoxqMlqzFbapaFuoldTpIpx6TLmiWSg
+PU1U/lAWn4IGPT6OPcJZyXgYNxs2Pixj5dAC4W+hpDTDecrVJzm+2jvMbLy7d0jl
+yqWA2ka/fQAIOw8giGkphTuaDBMOt8yP2dpdrfac25aNUuEk3S7TG1KreAyvrkvH
+ByaYWwWuY2yBRn+EI+K7
+=LQ5T
+-----END PGP SIGNATURE-----
diff --git a/cryptsetup.spec b/cryptsetup.spec
index 24115d9..3279a56 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -2,8 +2,8 @@
 
 Summary: A utility for setting up encrypted disks
 Name: cryptsetup
-Version: 1.6.8
-Release: 2%{?dist}
+Version: 1.7.0
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/System
 URL: https://gitlab.com/cryptsetup/cryptsetup
@@ -17,7 +17,7 @@ Requires: cryptsetup-libs = %{version}-%{release}
 Requires: libpwquality >= 1.2.0
 
 %define upstream_version %{version}
-Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/cryptsetup-%{upstream_version}.tar.xz
+Source0: https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/cryptsetup-%{upstream_version}.tar.xz
 
 %description
 The cryptsetup package contains a utility for setting up
@@ -168,6 +168,12 @@ popd
 %clean
 
 %changelog
+
+* Tue Nov 03 2015 Milan Broz <gmazyland@gmail.com> - 1.7.0-1
+- Update to cryptsetup 1.7.0.
+- Switch to sha256 as default hash.
+- Increase default PBKDF2 iteration time to 2 seconds.
+
 * Tue Sep 08 2015 Milan Broz <gmazyland@gmail.com> - 1.6.8-2
 - Update to cryptsetup 1.6.8.
 
diff --git a/sources b/sources
index 1dc1dfc..6148d6a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a04d97ca2874e98c112fddbe930b19de  cryptsetup-1.6.8.tar.xz
+56c385fe87fc2b6873df4b7f89202d0f  cryptsetup-1.7.0.tar.xz