diff --git a/.gitignore b/.gitignore
index d0312e2..064a588 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@ SOURCES/samba-pubkey_AA99442FB680B620.gpg
 /samba-4.18.4.tar.xz
 /samba-4.18.5.tar.asc
 /samba-4.18.5.tar.xz
+/samba-4.18.6.tar.xz
+/samba-4.18.6.tar.asc
diff --git a/samba-pubkey_AA99442FB680B620.gpg b/samba-pubkey_AA99442FB680B620.gpg
new file mode 100644
index 0000000..c901409
Binary files /dev/null and b/samba-pubkey_AA99442FB680B620.gpg differ
diff --git a/samba.spec b/samba.spec
index 8861a2b..bdc1a9e 100644
--- a/samba.spec
+++ b/samba.spec
@@ -137,8 +137,8 @@
 
 %define samba_requires_eq()  %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
 
-%global samba_version 4.18.5
-%global baserelease 0
+%global samba_version 4.18.6
+%global baserelease 1
 # This should be rc1 or %%nil
 %global pre_release %nil
 
@@ -4328,6 +4328,9 @@ fi
 %endif
 
 %changelog
+* Thu Aug 17 2023 Andreas Schneider <asn@redhat.com> - 4.18.6-1
+- related: rhbz#2190417 - Update to version 4.18.6
+
 * Thu Jul 20 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.18.5-0
 - resolves: rhbz#2222894 - Fix CVE-2022-2127 CVE-2023-3347 CVE-2023-34966 CVE-2023-34967 CVE-2023-34968
 
diff --git a/sources b/sources
index da80411..18c8d6c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-SHA512 (samba-4.18.5.tar.asc) = 29b541a95dc565e541526a9aeecff5d4df4e7df38c5c00ec8cc848b13c683c0d0c7dee442ab1a2d03e0f88b960cec7fb5a2cb8ea44c53ce29c858f5a058e7f84
-SHA512 (samba-4.18.5.tar.xz) = 3e405731813d5b0937e6c16938c6dcf8e182dafd29010dc75711afc397a63ee459fda04e78ff24e31fa0efd213e25a7e6c214a5bdf82d4d0f0123f2c6a8ebdd6
-SHA512 (samba-pubkey_AA99442FB680B620.gpg) = 4a13414888fae9776a8edfb629e7002689f01cc482df9686c91eaec793b5e2afa2e1afe6ffeb424093a12259594676d40b4343e844a00499888840f7fe96a199
+SHA512 (samba-4.18.6.tar.xz) = 019c66aafe4a8c83da096ff264836c73a56e388ff7fa2d97587f4fb77b08d382146cac807f01e8c35fe873e938501a70d68f0e0947f8856d99c0dfc4ab3f4d94
+SHA512 (samba-4.18.6.tar.asc) = b7d7198a536c47cae8b44f0c2b9ad528f0b9422fb6b6bec93ce44b6f7fcb894f6622fa5de67654f6d435f922666328408ea2be82ebf50f46b4651ee21f129896