diff --git a/.gitignore b/.gitignore
index 14cacb3..f9fabd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /neomutt-ef0cb55.tar.gz
 /neomutt-20230322.tar.gz
 /neomutt-20230407.tar.gz
+/neomutt-20230512.tar.gz
diff --git a/neomutt-ssl_ciphers.patch b/neomutt-ssl_ciphers.patch
index 2914075..da1b07c 100644
--- a/neomutt-ssl_ciphers.patch
+++ b/neomutt-ssl_ciphers.patch
@@ -1,4 +1,4 @@
-From 6cc49a7bdaec98559526aa0b72fb54c95f7465f9 Mon Sep 17 00:00:00 2001
+From ce684a27418574aa333dae961abc5f0234af8aa4 Mon Sep 17 00:00:00 2001
 From: Richard Russon <rich@flatcap.org>
 Date: Wed, 1 Jun 2016 21:38:22 +0100
 Subject: neomutt-ssl_ciphers
@@ -22,72 +22,72 @@ index 62e6b9da8..45dc34db0 100644
    },
    { "ssl_client_cert", DT_PATH|DT_PATH_FILE, 0, 0, NULL,
 diff --git a/conn/gnutls.c b/conn/gnutls.c
-index 5650e1d53..b0c0ebbb6 100644
+index 571344bcc..14cb1f1cb 100644
 --- a/conn/gnutls.c
 +++ b/conn/gnutls.c
-@@ -761,35 +761,38 @@ static int tls_set_priority(struct TlsSockData *data)
+@@ -758,35 +758,38 @@ static int tls_set_priority(struct TlsSockData *data)
    else
-     mutt_buffer_strcpy(priority, "NORMAL");
+     buf_strcpy(priority, "NORMAL");
  
 -  const bool c_ssl_use_tlsv1_3 = cs_subset_bool(NeoMutt->sub, "ssl_use_tlsv1_3");
 -  if (!c_ssl_use_tlsv1_3)
 +  if (c_ssl_ciphers && (strcmp(c_ssl_ciphers, "@SYSTEM") == 0))
    {
 -    nproto--;
--    mutt_buffer_addstr(priority, ":-VERS-TLS1.3");
+-    buf_addstr(priority, ":-VERS-TLS1.3");
 -  }
 -  const bool c_ssl_use_tlsv1_2 = cs_subset_bool(NeoMutt->sub, "ssl_use_tlsv1_2");
 -  if (!c_ssl_use_tlsv1_2)
 -  {
 -    nproto--;
--    mutt_buffer_addstr(priority, ":-VERS-TLS1.2");
+-    buf_addstr(priority, ":-VERS-TLS1.2");
 -  }
 -  const bool c_ssl_use_tlsv1_1 = cs_subset_bool(NeoMutt->sub, "ssl_use_tlsv1_1");
 -  if (!c_ssl_use_tlsv1_1)
 -  {
 -    nproto--;
--    mutt_buffer_addstr(priority, ":-VERS-TLS1.1");
+-    buf_addstr(priority, ":-VERS-TLS1.1");
 -  }
 -  const bool c_ssl_use_tlsv1 = cs_subset_bool(NeoMutt->sub, "ssl_use_tlsv1");
 -  if (!c_ssl_use_tlsv1)
 -  {
 -    nproto--;
--    mutt_buffer_addstr(priority, ":-VERS-TLS1.0");
+-    buf_addstr(priority, ":-VERS-TLS1.0");
 -  }
 -  const bool c_ssl_use_sslv3 = cs_subset_bool(NeoMutt->sub, "ssl_use_sslv3");
 -  if (!c_ssl_use_sslv3)
 -  {
 -    nproto--;
--    mutt_buffer_addstr(priority, ":-VERS-SSL3.0");
+-    buf_addstr(priority, ":-VERS-SSL3.0");
 +    const bool c_ssl_use_tlsv1_3 = cs_subset_bool(NeoMutt->sub, "ssl_use_tlsv1_3");
 +    if (!c_ssl_use_tlsv1_3)
 +    {
 +      nproto--;
-+      mutt_buffer_addstr(priority, ":-VERS-TLS1.3");
++      buf_addstr(priority, ":-VERS-TLS1.3");
 +    }
 +    const bool c_ssl_use_tlsv1_2 = cs_subset_bool(NeoMutt->sub, "ssl_use_tlsv1_2");
 +    if (!c_ssl_use_tlsv1_2)
 +    {
 +      nproto--;
-+      mutt_buffer_addstr(priority, ":-VERS-TLS1.2");
++      buf_addstr(priority, ":-VERS-TLS1.2");
 +    }
 +    const bool c_ssl_use_tlsv1_1 = cs_subset_bool(NeoMutt->sub, "ssl_use_tlsv1_1");
 +    if (!c_ssl_use_tlsv1_1)
 +    {
 +      nproto--;
-+      mutt_buffer_addstr(priority, ":-VERS-TLS1.1");
++      buf_addstr(priority, ":-VERS-TLS1.1");
 +    }
 +    const bool c_ssl_use_tlsv1 = cs_subset_bool(NeoMutt->sub, "ssl_use_tlsv1");
 +    if (!c_ssl_use_tlsv1)
 +    {
 +      nproto--;
-+      mutt_buffer_addstr(priority, ":-VERS-TLS1.0");
++      buf_addstr(priority, ":-VERS-TLS1.0");
 +    }
 +    const bool c_ssl_use_sslv3 = cs_subset_bool(NeoMutt->sub, "ssl_use_sslv3");
 +    if (!c_ssl_use_sslv3)
 +    {
 +      nproto--;
-+      mutt_buffer_addstr(priority, ":-VERS-SSL3.0");
++      buf_addstr(priority, ":-VERS-SSL3.0");
 +    }
    }
  
diff --git a/neomutt-system_certs.patch b/neomutt-system_certs.patch
index 6a117da..a8da7fb 100644
--- a/neomutt-system_certs.patch
+++ b/neomutt-system_certs.patch
@@ -1,4 +1,4 @@
-From 8605dd6b2076e22e79b1c876eedd90d5c45a92c5 Mon Sep 17 00:00:00 2001
+From 4fdb47bea7eda0e37da7e40679467a99f2b612e7 Mon Sep 17 00:00:00 2001
 From: Richard Russon <rich@flatcap.org>
 Date: Wed, 1 Jun 2016 21:38:43 +0100
 Subject: neomutt-system_certs
diff --git a/neomutt.spec b/neomutt.spec
index 22e009a..0e130de 100644
--- a/neomutt.spec
+++ b/neomutt.spec
@@ -1,6 +1,6 @@
 Summary: Text mode Mail Client
 Name: neomutt
-Version: 20230407
+Version: 20230512
 Release: 1%{?dist}
 Epoch: 6
 Url: https://neomutt.org/
@@ -39,8 +39,8 @@ messages.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1 -b .system_certs
-%patch2 -p1 -b .ssl_ciphers
+%patch 1 -p1 -b .system_certs
+%patch 2 -p1 -b .ssl_ciphers
 
 %build
 %{configure} \
diff --git a/sources b/sources
index effa99a..bbb34b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (neomutt-20230407.tar.gz) = 53604ce396fb53bf01662c7105a632e0e7a50d66f0d265193c591d7f16cbbfd276925c7ae965ccf9faf9b2070d7db48c4ee6d44b0c9552f9214647c5a7e8c46d
+SHA512 (neomutt-20230512.tar.gz) = 0d853a9913e721709f2b457852c12584addc71709f2345a8dabd3084ecee1e7b52652c6159a9b96a0455a64c0a291ecc1fd801f6c1fc095e5c57b757b9929127