diff --git a/.gitignore b/.gitignore
index 5300ade..986919c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /clevis-15.tar.xz
 /clevis-16.tar.xz
 /clevis-17.tar.xz
+/clevis-18.tar.xz
diff --git a/0001-Fix-for-t-option-in-clevis-luks-bind-297.patch b/0001-Fix-for-t-option-in-clevis-luks-bind-297.patch
deleted file mode 100644
index 9fb9745..0000000
--- a/0001-Fix-for-t-option-in-clevis-luks-bind-297.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From a7d17dab6957b3036972575af04b55590c53b9ad Mon Sep 17 00:00:00 2001
-From: John Baublitz <jbaublitz@redhat.com>
-Date: Tue, 16 Mar 2021 09:36:46 -0400
-Subject: [PATCH] Fix for -t option in clevis luks bind (#297)
-
----
- src/luks/clevis-luks-bind                | 2 +-
- src/luks/clevis-luks-common-functions.in | 2 +-
- src/luks/tests/bind-luks2                | 4 ++++
- 3 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/luks/clevis-luks-bind b/src/luks/clevis-luks-bind
-index 9bea9b1..a0f3430 100755
---- a/src/luks/clevis-luks-bind
-+++ b/src/luks/clevis-luks-bind
-@@ -119,7 +119,7 @@ if [ "${luks_type}" = "luks1" ] && ! luksmeta test -d "${DEV}"; then
-     luksmeta init -d "${DEV}" ${FRC}
- fi
- 
--if ! clevis_luks_do_bind "${DEV}" "${SLT}" "" \
-+if ! clevis_luks_do_bind "${DEV}" "${SLT}" "${TOKEN_ID}" \
-                          "${PIN}" "${CFG}" \
-                          "${YES}" "" \
-                          "${existing_key}" "${keyfile}"; then
-diff --git a/src/luks/clevis-luks-common-functions.in b/src/luks/clevis-luks-common-functions.in
-index 1bd7616..30fef56 100644
---- a/src/luks/clevis-luks-common-functions.in
-+++ b/src/luks/clevis-luks-common-functions.in
-@@ -978,7 +978,7 @@ clevis_luks_do_bind() {
-         return 1
-     fi
- 
--    if ! clevis_luks_save_slot "${DEV}" "${SLT}" "${tkn_id}" \
-+    if ! clevis_luks_save_slot "${DEV}" "${SLT}" "${TKN_ID}" \
-                                "${jwe}" "${OVERWRITE}"; then
-         echo "Unable to update metadata; operation cancelled" >&2
-         clevis_luks_restore_dev "${CLEVIS_TMP_DIR}" || :
-diff --git a/src/luks/tests/bind-luks2 b/src/luks/tests/bind-luks2
-index 492db50..04c6b8e 100755
---- a/src/luks/tests/bind-luks2
-+++ b/src/luks/tests/bind-luks2
-@@ -47,3 +47,7 @@ new_device "luks2" "${DEV}"
- if ! clevis luks bind -d "${DEV}" -t "$TOKEN_ID" tang "${CFG}" <<< "${DEFAULT_PASS}"; then
-     error "${TEST}: Binding is expected to succeed when given a correct (${DEFAULT_PASS}) password." >&2
- fi
-+
-+if ! cryptsetup token export --token-id=5 "${DEV}"; then
-+    error "${TEST}: Clevis did not add the LUKS2 token to the correct slot." >&2
-+fi
--- 
-2.30.2
-
diff --git a/clevis.spec b/clevis.spec
index f4e1bd4..0459089 100644
--- a/clevis.spec
+++ b/clevis.spec
@@ -1,5 +1,5 @@
 Name:           clevis
-Version:        17
+Version:        18
 Release:        1%{?dist}
 Summary:        Automated decryption framework
 
@@ -192,6 +192,9 @@ exit 0
 %attr(4755, root, root) %{_libexecdir}/%{name}-luks-udisks2
 
 %changelog
+* Thu Apr 15 2021 Sergio Correia <scorreia@redhat.com> - 18-1
+- Update to new clevis upstream release, v18.
+
 * Wed Apr 14 2021 Sergio Correia <scorreia@redhat.com> - 17-1
 - Update to new clevis upstream release, v17.
 
diff --git a/sources b/sources
index 57ec2e0..8e5fc4f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (clevis-17.tar.xz) = 2b04aece37bf1869e7ec945a7da65d3e2cd4ee6de575174377ddd0c0e9598f6c822753a2edf037958dde6bc82257cd7221a44430c4fb153348eec4ecd359a525
+SHA512 (clevis-18.tar.xz) = 2385b49f63b8237d44b3790560cd74372d598fd3728945ac11278c09e1e1583bea279eeff43c4fd57b0530a66c532ebfa7eb7f11da9732a50da80389e45ed1d1