diff --git a/.gitignore b/.gitignore
index 71fcca4..bf63c7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/cryptsetup-2.3.5.tar.xz
+/cryptsetup-2.3.6.tar.xz
diff --git a/cryptsetup-2.3.5.tar.sign b/cryptsetup-2.3.5.tar.sign
deleted file mode 100644
index 25a76a0..0000000
--- a/cryptsetup-2.3.5.tar.sign
+++ /dev/null
@@ -1,16 +0,0 @@
------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.6.tar.sign b/cryptsetup-2.3.6.tar.sign
new file mode 100644
index 0000000..3b218c3
--- /dev/null
+++ b/cryptsetup-2.3.6.tar.sign
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEKikYJD/eRmSNBob52bBXe9k+mPwFAmCwxOgACgkQ2bBXe9k+
+mPzlCg//XVdN6WnGhf35DT2f39GpSUimEAmkK/P3xKYGouzlUEac20mzXsNvkv+H
+BpTN507H44ThgQENPAaKTea9FkqpZIcoBZcPnTXJOQ/ZIfR+iglb4zF9lR1PuVx7
+PuyVZ7BgMxM6lFvOwt5/bkktCDn8uX0nYvzqf9DXWVFUm973NayqftxsbgPa+4DT
+vW2E87sJOM2NLw6psPu3o+wYkKm4N1r+M9JCWNqY8bwvlV5YbW4yBifZl4oU+99l
+VXcqgSQunAvEzRPhtwCUxfYNRULx6xknNZVuwl37sSYgDpjjooy+6qjz1PX8g/qa
+4/Wc0u2q/QmIUq13D2dFdQIrfDaZEJe8d0/yyaCnxPlCVFOhmr31U08o2pK1zJSK
+duUqWVIKQNSFafygrPTeMRhZ1L2iwJZgjuCDyhoJSa62kGvYcLxjEoXjRmeiLXAn
+7aVrmbf4tmJUJ8EUden40JM7MxPeKwHfUhE4Aq//qDfPVId7YFdgnBh6PmwUcyRm
+HTyNJP8ULFX+u+v9C5YbXxb+h6xb65wzQDY1T1IPEJicIu/kv/syac/9QUkF9yG+
+Gsxaq9Ath2UYp7NW11/LXW0jmWVcM2eOfZi6xg8+vT6HWxG58Qzh//gPoLBpzBOj
+E94vQim+q+ky0ePAqi2uEfZUiiID2ns4JYeXoYkxx9aGl/eRrp8=
+=AlrZ
+-----END PGP SIGNATURE-----
diff --git a/cryptsetup.spec b/cryptsetup.spec
index 74850ac..11d664d 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -1,7 +1,7 @@
 Summary: Utility for setting up encrypted disks
 Name: cryptsetup
-Version: 2.3.5
-Release: 5%{?dist}
+Version: 2.3.6
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: https://gitlab.com/cryptsetup/cryptsetup
 BuildRequires: openssl-devel, popt-devel, device-mapper-devel
@@ -116,6 +116,10 @@ rm -rf %{buildroot}%{_libdir}/*.la
 %ghost %attr(700, -, -) %dir /run/cryptsetup
 
 %changelog
+* Wed Jun 16 2021 Ondrej Kozina <okozina@redhat.com> - 2.3.6-1
+- Update to cryptsetup 2.3.6.
+- Resolves: #1961291 #1970932
+
 * Tue Jun 15 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.5-5
 - Rebuilt for RHEL 9 BETA for openssl 3.0
 
diff --git a/sources b/sources
index 5221108..e035a34 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cryptsetup-2.3.5.tar.xz) = 60695a445608e2019ffc4f4ea4d7f6819849991bf2862e5648920abccea33990210554fcbf5a512659b513b27d3759fe3c1e64e96f02d9301463a48f2dbf04bf
+SHA512 (cryptsetup-2.3.6.tar.xz) = 5b25cc806140d24181a0e4f0e7b0bd3caa8263aa502e8633b41c980f06ecba2e6acbf9c2d9cc4a785d38ce90d86dd8d22c52b28b9ca4a15824c2e8bdb3656665