diff --git a/.gitignore b/.gitignore
index eb68f3e..fc50d23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /v1.11.1.tar.gz
 /nvme-cli-2.0-rc4.tar.gz
 /nvme-cli-2.0-rc5.tar.gz
+/nvme-cli-2.0-rc6.tar.gz
diff --git a/connect_return_code.patch b/connect_return_code.patch
new file mode 100644
index 0000000..07f1fc4
--- /dev/null
+++ b/connect_return_code.patch
@@ -0,0 +1,25 @@
+commit 9ec18159f75512687a3df22eee15fbafc4c87c9a
+Author: Tomas Bzatek <tbzatek@redhat.com>
+Date:   Mon Mar 14 18:15:20 2022 +0100
+
+    connect: Set errno to zero on nvmf_add_ctrl() success
+    
+    The libnvme's nvmf_add_ctrl() might return zero (success) while
+    having errno set to a non-zero value due to lots of calls inside.
+    And since nvmf_connect() returns errno primarily, make sure
+    it's zeroed on success.
+    
+    See related https://github.com/linux-nvme/libnvme/pull/292
+
+diff --git a/fabrics.c b/fabrics.c
+index 49378dc..e08ffd6 100644
+--- a/fabrics.c
++++ b/fabrics.c
+@@ -688,6 +688,7 @@ int nvmf_connect(const char *desc, int argc, char **argv)
+ 		fprintf(stderr, "no controller found: %s\n",
+ 			nvme_strerror(errno));
+ 	else {
++		errno = 0;
+ 		if (flags == NORMAL)
+ 			print_connect_msg(c);
+ 		else if (flags == JSON)
diff --git a/nvme-cli.spec b/nvme-cli.spec
index 82c5510..29840a3 100644
--- a/nvme-cli.spec
+++ b/nvme-cli.spec
@@ -1,5 +1,5 @@
 Name:           nvme-cli
-Version:        2.0~rc5
+Version:        2.0~rc6
 Release:        1%{?dist}
 Summary:        NVMe management command line interface
 
@@ -7,6 +7,9 @@ License:        GPLv2+
 URL:            https://github.com/linux-nvme/nvme-cli
 Source0:        %{url}/archive/v%{version_no_tilde}/%{name}-%{version_no_tilde}.tar.gz
 
+# backport from upstream
+Patch0:         connect_return_code.patch
+
 BuildRequires:  meson >= 0.47.0
 BuildRequires:  libuuid-devel
 BuildRequires:  gcc gcc-c++
@@ -74,6 +77,9 @@ rm -rf %{buildroot}%{_pkgdocdir}/nvme
 
 
 %changelog
+* Tue Mar 15 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.0~rc6-1
+- Update to 2.0-rc6
+
 * Fri Mar 04 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.0~rc5-1
 - Update to 2.0-rc5
 
diff --git a/sources b/sources
index 52eeb54..36fb6ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nvme-cli-2.0-rc5.tar.gz) = 499d1476aee77195f06aaaaf9543340605212554bbe731af8f03a62a221f26857f23e10dc2ef6e2555930b5e40601f64f01da303d91ed88d200ed11f94220e44
+SHA512 (nvme-cli-2.0-rc6.tar.gz) = 00e0376f0a5b69c2a9192c8261da73492aeb6bfe19cd488382e18b50e247a4591b470349f42503bab5d4881c35a056a033213624503efa62de9f8e98dfe4b005