diff --git a/cryptsetup-2.3.4.tar.sign b/cryptsetup-2.3.4.tar.sign
deleted file mode 100644
index 2613d8a..0000000
--- a/cryptsetup-2.3.4.tar.sign
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAl9RNsoACgkQ2bBXe9k+
-mPxlkg//RvvQ8uWvw9hKtKAz4Q0ZEbprzFVIGpXprYzDcf5HE2vFMsg3OZ+RAUss
-RmBk4HRZDH7nboFa+D3gUAFiqqwJvBIEce6jjKu7IQM86lbnwlH4Uu9UWz/hiOCt
-wDDfCE96aso8D9ZKQBNrrMmIuJ0kSbQ8PoIvmmVtjcGNhtKna7KV/i+9xbdEaePl
-Piu0SO0ZtMBtBribgfsZHuOuuHLYgPA7mfZ1Xwq6hOMw9qjFSDGwmeldyTbP7mM6
-0L7daWn8UJIYhi9BABtpqEC+4ISs7An0bJ3w64k+6hUq7o33sq++gR2qbjIq7rVz
-wX1S6VP8Y4dwZY9HRW7GrDsrLg6c5ynAfmEoCPhYRTbkQ1ft9fXRjk06GrDg+9A8
-kKY2m+4rSOoj0hZq+TeWjWNRibwEaUAxf71Dpv7FjYMLr5lpZD9+1GfXxsm5EJMV
-O3XwLgwSqypl5rYoQo+ebgpPUqJsxTNg2Uu5dT4oUI8UcTO+5gw5/vTbwBL0a13z
-iDlWgSQ267WP0t1Ipsfmfa6RAWLlykmLMt3eBjxhi0UIGRiUfVlS2++Tvm1xBHXa
-9ufCYLmiqtjIH82+03pWsfmZ+gTFRHC3TI9H3aZTGqGptG9rrHSvgLMhPTvxhTX9
-FfdZxSY6ZVkatpeyUhSKNtrqPPEoShax/erIvj0d/uaT0BgFA3M=
-=NBdh
------END PGP SIGNATURE-----
diff --git a/cryptsetup-2.3.4.tar.xz b/cryptsetup-2.3.4.tar.xz
deleted file mode 100644
index d858da8..0000000
--- a/cryptsetup-2.3.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9d16eebb96b53b514778e813019b8dd15fea9fec5aafde9fae5febf59df83773
-size 11114004
diff --git a/cryptsetup-2.3.5.tar.sign b/cryptsetup-2.3.5.tar.sign
new file mode 100644
index 0000000..743e61d
--- /dev/null
+++ b/cryptsetup-2.3.5.tar.sign
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmBKB/wACgkQ2bBXe9k+
+mPxiiQ//UJrSk2F3QvdqT8vJvR4Z8rG6Vbg5LvXzryhx+g925dG5CLhPWdMVqKed
+QQAheRL+n+Dm9bClaleWnXj1Js8GIYkXIa/Cz7Mj/5kjOHd+73SZq5zBh3NjuaDp
+eU+GYvCvuUhzs6pB7MZpUNdYAmFMeQFf1Y9dGA1oQULrdFPb6DFe+Q1IL4g9o92Q
+NEFN5yScQeQMpaVVfE3lOl31xObpyuStvd3VNXjouOHGwnFTXY+2TcabOr/WJ5rL
+EkDG2H80SWUTOmz6bgLiu5vJQVFisPT+i08GAJfs6ESIV7K1S8MrS3LgwRNIBRMv
+8tqY+KdPkZqDa2tgOilF1t43ztt229lQDPIC9mJeeof+qJtfroNkKhZAEQPcqoAo
+CXQ0JlMxTTeLq+s14P0eVPLkx5y3VKZoO1fjysrIeKAr918ex7AHyV9GTHeGVAei
+GjzASuHWRoi31GgQlx/RL+01pHI6HjRABjajp2xwlKWnUVC5PmSDWN116pm652G+
+qtWl4Uy1rfX3ais0PO/8WCmic8AHJgl0XoE4QOZxaJrR+utA37eekXw52pmoNmOu
+ur3g+FGjRcWJ1oP2Kb689207wd+Ym9EibZRAD2J+hHnhXqC/aAmJRUP5lJTjRYUN
+7qcHnjY/zyFziRPqWxzih7Pt66GyRPdvOnc4DVxxwNi9hlGTiY4=
+=9hRP
+-----END PGP SIGNATURE-----
diff --git a/cryptsetup-2.3.5.tar.xz b/cryptsetup-2.3.5.tar.xz
new file mode 100644
index 0000000..6e31b2a
--- /dev/null
+++ b/cryptsetup-2.3.5.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ced9946f444d132536daf92fc8aca4277638a3c2d96e20540b2bae4d36fd70c1
+size 11146364
diff --git a/cryptsetup-rpmlintrc b/cryptsetup-rpmlintrc
new file mode 100644
index 0000000..fb665e4
--- /dev/null
+++ b/cryptsetup-rpmlintrc
@@ -0,0 +1,5 @@
+# intentionally named
+addFilter("libcryptsetup.*hmac.* hidden-file-or-dir .*\.libcryptsetup\.so\..*\.hmac")
+# hmacs for identical files are identical
+addFilter("libcryptsetup.*hmac.* files-duplicate .*\.libcryptsetup\.so\..*\.hmac")
+
diff --git a/cryptsetup.changes b/cryptsetup.changes
index 92d4a43..ab273e6 100644
--- a/cryptsetup.changes
+++ b/cryptsetup.changes
@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Sat Mar 13 11:29:54 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- cryptsetup 2.3.5:
+  * Fix partial reads of passphrase from an interactive terminal
+  * Fix maximum length of password entered through a terminal
+  * integritysetup: support new dm-integrity HMAC recalculation
+    options
+  * integritysetup: display of recalculating sector in dump command
+  * veritysetup: fix verity FEC if stored in the same image with
+    hashes
+  * veritysetup: run FEC repair check even if root hash fails
+  * veritysetup: do not process hash image if hash area is empty
+  * veritysetup: store verity hash algorithm in superblock in
+    lowercase
+  * bitlk: fix a crash if the device disappears during BitLocker
+    scan
+  * bitlk: show a better error when trying to open an NTFS device
+  * bitlk: add support for startup key protected VMKs
+  * Fix LUKS1 repair code (regression since version 1.7.x)
+  * Fix luksKeyChange for LUKS2 with assigned tokens
+  * Fix cryptsetup resize using LUKS2 tokens
+  * Print a visible error if device resize is not supported
+  * Add error message when suspending wrong non-LUKS device
+  * Fix default XTS mode key size in reencryption
+  * Rephrase missing locking directory warning and move it to
+    debug level
+  * Many fixes for the use of cipher_null (empty debug cipher)
+  * Fixes for libpasswdqc 2.0.x (optional passphrase quality check)
+  * Fixes for problems discovered by various tools for code
+    analysis
+  * Various fixes to man pages
+- silence hmac packaging warnings
+
+-------------------------------------------------------------------
+Fri Mar 12 22:39:39 UTC 2021 - Dirk Müller <dmueller@suse.com>
+
+- move licenses to licensedir 
+
 -------------------------------------------------------------------
 Tue Dec  8 08:52:50 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
 
diff --git a/cryptsetup.spec b/cryptsetup.spec
index c0522ab..f7d4163 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cryptsetup
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@ Name:           cryptsetup2
 %else
 Name:           cryptsetup
 %endif
-Version:        2.3.4
+Version:        2.3.5
 Release:        0
 Summary:        Setup program for dm-crypt Based Encrypted Block Devices
 License:        SUSE-GPL-2.0-with-openssl-exception AND LGPL-2.0-or-later
@@ -33,6 +33,7 @@ Source0:        https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetu
 Source1:        https://www.kernel.org/pub/linux/utils/cryptsetup/v2.3/cryptsetup-%{version}.tar.sign
 Source2:        baselibs.conf
 Source3:        cryptsetup.keyring
+Source4:        %{name}-rpmlintrc
 BuildRequires:  device-mapper-devel
 BuildRequires:  fipscheck
 BuildRequires:  fipscheck-devel
@@ -40,7 +41,6 @@ BuildRequires:  libjson-c-devel
 BuildRequires:  libpwquality-devel
 BuildRequires:  libselinux-devel
 BuildRequires:  libuuid-devel
-BuildRequires:  pkgconfig(openssl)
 # 2.6.38 has the required if_alg.h
 BuildRequires:  linux-glibc-devel >= 2.6.38
 BuildRequires:  pkgconfig
@@ -48,13 +48,14 @@ BuildRequires:  popt-devel
 BuildRequires:  suse-module-tools
 BuildRequires:  pkgconfig(blkid)
 BuildRequires:  pkgconfig(libargon2)
+BuildRequires:  pkgconfig(openssl)
+Requires(post): coreutils
+Requires(postun): coreutils
 %if 0%{?is_backports}
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
 %endif
-Requires(post): coreutils
-Requires(postun): coreutils
 
 %lang_package(cryptsetup)
 
@@ -124,7 +125,7 @@ autoreconf -f -i
   --with-default-luks-format=LUKS1 \
   --with-luks2-lock-path=/run/cryptsetup \
   --with-tmpfilesdir='%{_tmpfilesdir}'
-make %{?_smp_mflags} V=1
+%make_build
 
 %install
 # Generate HMAC checksums (FIPS)
@@ -171,7 +172,8 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %postun -n libcryptsetup%{so_ver} -p /sbin/ldconfig
 
 %files
-%doc AUTHORS COPYING* FAQ README TODO docs/ChangeLog.old docs/*ReleaseNotes
+%license COPYING*
+%doc AUTHORS FAQ README TODO docs/ChangeLog.old docs/*ReleaseNotes
 %if !0%{?usrmerged}
 /sbin/cryptsetup%{?is_backports:2}
 %endif
@@ -179,10 +181,10 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_sbindir}/veritysetup%{?is_backports:2}
 %{_sbindir}/integritysetup%{?is_backports:2}
 %{_sbindir}/cryptsetup-reencrypt%{?is_backports:2}
-%{_mandir}/man8/cryptsetup%{?is_backports:2}.8%{ext_man}
-%{_mandir}/man8/cryptsetup-reencrypt%{?is_backports:2}.8%{ext_man}
-%{_mandir}/man8/veritysetup%{?is_backports:2}.8%{ext_man}
-%{_mandir}/man8/integritysetup%{?is_backports:2}.8%{ext_man}
+%{_mandir}/man8/cryptsetup%{?is_backports:2}.8%{?ext_man}
+%{_mandir}/man8/cryptsetup-reencrypt%{?is_backports:2}.8%{?ext_man}
+%{_mandir}/man8/veritysetup%{?is_backports:2}.8%{?ext_man}
+%{_mandir}/man8/integritysetup%{?is_backports:2}.8%{?ext_man}
 %if !0%{?is_backports}
 %{_tmpfilesdir}/cryptsetup.conf
 %ghost %dir /run/cryptsetup