diff --git a/.gitignore b/.gitignore
index 3555f05..c0a99be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@
 /nvme-cli-2.3.tar.gz
 /nvme-cli-2.4.tar.gz
 /nvme-cli-2.5.tar.gz
+/nvme-cli-2.6.tar.gz
diff --git a/nvme-cli.spec b/nvme-cli.spec
index 8f80740..d94873e 100644
--- a/nvme-cli.spec
+++ b/nvme-cli.spec
@@ -2,11 +2,11 @@
 %{!?version_no_tilde: %define version_no_tilde %{shrink:%(echo '%{version}' | tr '~' '-')}}
 
 Name:           nvme-cli
-Version:        2.5
-Release:        2%{?dist}
+Version:        2.6
+Release:        1%{?dist}
 Summary:        NVMe management command line interface
 
-License:        GPLv2
+License:        GPL-2.0-only
 URL:            https://github.com/linux-nvme/nvme-cli
 Source0:        %{url}/archive/v%{version_no_tilde}/%{name}-%{version_no_tilde}.tar.gz
 
@@ -17,17 +17,9 @@ BuildRequires:  systemd-rpm-macros
 BuildRequires:  zlib-devel
 BuildRequires:  openssl-devel
 
-BuildRequires:  libnvme-devel >= 1.5
+BuildRequires:  libnvme-devel >= 1.6
 BuildRequires:  json-c-devel >= 0.13
 
-%if (0%{?rhel} == 0)
-BuildRequires:  python3-nose2
-# https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_linters
-#BuildRequires:  python3-mypy
-#BuildRequires:  python3-flake8
-#BuildRequires:  python3-autopep8
-#BuildRequires:  python3-isort
-%endif
 BuildRequires:  asciidoc
 BuildRequires:  xmlto
 
@@ -72,7 +64,7 @@ rm -rf %{buildroot}%{_pkgdocdir}/nvme
 %{_datadir}/bash-completion/completions/nvme
 %{_datadir}/zsh/site-functions/_nvme
 %dir %{_sysconfdir}/nvme
-%{_sysconfdir}/nvme/discovery.conf
+%config(noreplace) %{_sysconfdir}/nvme/discovery.conf
 %{_unitdir}/nvmefc-boot-connections.service
 %{_unitdir}/nvmf-autoconnect.service
 %{_unitdir}/nvmf-connect.target
@@ -84,6 +76,15 @@ rm -rf %{buildroot}%{_pkgdocdir}/nvme
 
 
 %changelog
+* Fri Sep 29 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.6-1
+- Update to 2.6
+
+* Thu Aug 17 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.5-4
+- Mark /etc/nvme/discovery.conf as (noreplace)
+
+* Mon Aug 14 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.5-3
+- Backport 'fabrics: Use corresponding hostid when hostnqn is generated'
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index f820245..844ac50 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nvme-cli-2.5.tar.gz) = 50c557e86e95b27a0ad57779c33bbb847e12dd45c30e792f5ce1d52dedd4bc704ac25fa0af2fdebd281c9dfe0059f7ed7c1620fccfde9323f6f9a97afdf8c3cb
+SHA512 (nvme-cli-2.6.tar.gz) = da4daef2d7c554455e0c195c03f92188e0e946409a3bd8a5b421d9a106746e82fb1309901d2893639b1a3447bda094c80a9f49f59bf43cf2b00402f82beea3fc