diff --git a/.gitignore b/.gitignore
index 9b3845c..8ad2b59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/samba-4.15.3.tar.xz
+SOURCES/samba-4.15.4.tar.xz
 SOURCES/samba-pubkey_AA99442FB680B620.gpg
diff --git a/.samba.metadata b/.samba.metadata
index 3011278..9e9a7e7 100644
--- a/.samba.metadata
+++ b/.samba.metadata
@@ -1,2 +1,2 @@
-e778708ce1f39566d91d74dce8e9940b324d1ef1 SOURCES/samba-4.15.3.tar.xz
+3fbb516599cecb226726fc4d286be4923ed69e21 SOURCES/samba-4.15.4.tar.xz
 971f563c447eda8d144d6c9e743cd0f0488c0d9e SOURCES/samba-pubkey_AA99442FB680B620.gpg
diff --git a/SOURCES/samba-4.15.3.tar.asc b/SOURCES/samba-4.15.3.tar.asc
deleted file mode 100644
index dbc01c2..0000000
--- a/SOURCES/samba-4.15.3.tar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEgfXigyvSVFoYl7cTqplEL7aAtiAFAmGww0kACgkQqplEL7aA
-tiCzMg/+IzBD53oeYFSSt6V9o1ZhD/7bL425n/7Ea2iLaHkOEQWN3AgKV7h1rdSb
-tS/Ys3xUf9LB1ZVkXbu17oWj5pG8aWcp6Ky80uXHycZ5X0/fcHegSU5SIyUfLs0F
-d3BXvFWkPIy8H9a55wFTpJte2ofRoFqWUG4MAlOq83ummnmrz0W5j6QcufVIRjWq
-hGMbg8Vjk+UEtKNO7fl8iSQ0ZRyXCkBR3biDBtMbvtoluaVkixxwwSPqgDoNXgju
-ox2EbVfHLSHc+7Tb30uKQq/mf3uhf6ASIrajNVrXotK1fgpCCKnMLb9qRHEftttY
-DwYKQvsrHCw9vYg/xyO2NOBr82mxjE6NBLsV1Kp8pdc4vInmAqOCsQpOuZ0SgO6u
-sZk4c5AkfH7pZtHeNtlefiGe8/7ApU6UC6kkXT3mnLBtWKMBte9/NR6ZgCLle7tV
-aAx6Io9j/rAeueRRgIK98bzxXSufjtFyNmM+Qr7IXnFHtJNM919ib4pr5DzpGwAc
-+FMG0LfmU0XiUXcbw/IZ3AOD2DBwZC58ZezO3alUS8eRqNTP13v3Uhg9F78+eyah
-Wbohx05Y4MA1ywtMd8z/dZn97nw3bw+z6fLNC//1Sq1qo1fXipaoSQW1LK9IHeVO
-cV7cvd2c16p7NN3Op+34QY7Nc7b1uhtTV3v3tiEQYR/uQx+tyz8=
-=fu6B
------END PGP SIGNATURE-----
diff --git a/SOURCES/samba-4.15.4.tar.asc b/SOURCES/samba-4.15.4.tar.asc
new file mode 100644
index 0000000..4a709a2
--- /dev/null
+++ b/SOURCES/samba-4.15.4.tar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEgfXigyvSVFoYl7cTqplEL7aAtiAFAmHoKSwACgkQqplEL7aA
+tiC0HhAAl/r2uVwDX5ftNqX9zmUtJr4wJl9o7cWgMchQpEYCGL8Fvk/tvJFpyJnU
+tLEEqgCItraJEk28cu4sAxM3TSziaCJ1KBWH/Pmltk6wSNoCGXxwZ0VhvGPmHx7D
+eBWyva0JtBjXAiTQe1mTv9URLgFMopUD0XPv2GJD6dkwL3cgmcjv7A/sYc9A6LpF
+sihJqWNjYgTxr8TpJb5uGoRE+Ko6pYKm4cUvBqZcOiyoZT+WGfPbaxqSissthkkw
+y2e/WXCINUMPZfhP6ZgjqszAUjvYPkOElhOUK2+rc2MuUixDrfv5I/IO+4zrh0l4
+J91SL4w6TkpfLYx0ryv+gAcXMoNE+lE5oYc/b3WrvQ23iw/w3hlQ/ajc8gtRgzHU
+EKt9Auebo/P/rPlqK511dAEajPNxBm0qE13s8hM/3lNUS9UvPW/k6DGkwOs2QUYU
+XcK97oNZFDBijG3b2bCgn686IJdpXwkOhEc24tGDzr2KrRU9dNRhXDs+1x7Rk7z7
+riJUU3taPTNjd9MH/1JADH13FusmlxNp5jllBzJFYuVNmHUCi8FXWBcthhf39TnT
+VMghhrsOvFAK7KXdMEtu+JuDNgHErQ12KLt+VO/3jf+V917LWNPmFFEoao9esGsD
+d8B9W7vzMEiaInBdw+fbvrcLu8ySAPHjK4i1/Ox1tXL+mK6A4/c=
+=UQ4l
+-----END PGP SIGNATURE-----
diff --git a/SPECS/samba.spec b/SPECS/samba.spec
index 057de27..bac8a05 100644
--- a/SPECS/samba.spec
+++ b/SPECS/samba.spec
@@ -1,6 +1,3 @@
-# Define _make_verbose if it doesn't exist (RHEL8)
-%{!?_make_verbose:%define _make_verbose V=1 VERBOSE=1}
-
 # The testsuite is disabled by default.
 #
 # To build and run the tests use:
@@ -22,6 +19,9 @@
 # ctdb is enabled by default, you can disable it with: --without clustering
 %bcond_without clustering
 
+# Define _make_verbose if it doesn't exist (RHEL8)
+%{!?_make_verbose:%define _make_verbose V=1 VERBOSE=1}
+
 # Build with Active Directory Domain Controller support by default on Fedora
 %if 0%{?fedora}
 %bcond_without dc
@@ -134,7 +134,7 @@
 
 %global baserelease 0
 
-%global samba_version 4.15.3
+%global samba_version 4.15.4
 %global talloc_version 2.3.3
 %global tdb_version 1.4.4
 %global tevent_version 0.11.0
@@ -4102,6 +4102,21 @@ fi
 %endif
 
 %changelog
+* Fri Jan 21 2022 Pavel Filipenský <pfilipen@redhat.com> - 4.15.4-0
+- Update to Samba 4.15.4
+- related: rhbz#2013596 - Rebase Samba to the the latest 4.15.x release
+- resolves: rhbz#2039153 - Fix CVE-2021-20316
+- resolves: rhbz#1912549 - Winexe: Kerberos flag not invoking Kerberos Auth
+- resolves: rhbz#2039157 - Fix CVE-2021-43566
+- resolves: rhbz#2038148 - Failed to authenticate users after upgrade samba package to release samba-4.14.5-7
+- resolves: rhbz#2035528 - [smb] Segmentation fault when joining the domain
+- resolves: rhbz#2038796 - filename_convert_internal: open_pathref_fsp [xxx] failed: NT_STATUS_ACCESS_DENIED 
+
+* Thu Dec 16 2021 Pavel Filipenský <pfilipen@redhat.com> - 4.15.3-1
+- related: rhbz#2013596 - Rebase to version 4.15.3
+- resolves: rhbz#2028029 - Fix possible null pointer dereference in winbind
+- resolves: rhbz#1912549 - Winexe: Kerberos Auth is respected via --use-kerberos=desired
+
 * Fri Dec 03 2021 Andreas Schneider <asn@redhat.com> - 4.15.2-2
 - related: rhbz#2013596 - Remove unneeded lmdb dependency