diff --git a/.gitignore b/.gitignore
index cc7e906..66f28b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -233,3 +233,5 @@ samba-3.6.0pre1.tar.gz
 /samba-4.13.4.tar.asc
 /samba-4.13.5.tar.xz
 /samba-4.13.5.tar.asc
+/samba-4.13.6.tar.xz
+/samba-4.13.6.tar.asc
diff --git a/samba.spec b/samba.spec
index 198411a..2ad35a9 100644
--- a/samba.spec
+++ b/samba.spec
@@ -10,7 +10,7 @@
 
 %define main_release 0
 
-%define samba_version 4.13.5
+%define samba_version 4.13.6
 %define talloc_version 2.3.1
 %define tdb_version 1.4.3
 %define tevent_version 0.10.2
@@ -3627,6 +3627,11 @@ fi
 %endif
 
 %changelog
+* Wed Mar 23 2021 Guenther Deschner <gdeschner@redhat.com> - 4.13.6-0
+- Update to Samba 4.13.6
+- resolves: #1941400, #1942496 - Security fixes for CVE-2020-27840
+- resolves: #1941402, #1942497 - Security fixes for CVE-2021-20277
+
 * Tue Mar 09 2021 Guenther Deschner <gdeschner@redhat.com> - 4.13.5-0
 - Update to Samba 4.13.5
 
diff --git a/sources b/sources
index 94a59a8..aaf65b2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (samba-4.13.5.tar.xz) = 93afa6aba7a34a1141c988c1b57830f7ae025647e9f78981d9af3477bccf37ae0957e1cdff9851898067e25be7cb00ea04902d0b8ff4e5c399a2a7e7146f9817
-SHA512 (samba-4.13.5.tar.asc) = 6e24d1b2993f79f645337fc90ad54c89d030f0ef72067c2656dc3f69f2ce1bbef6bd4d3bcd6a82fc226f36eb795fb8f5122a74f38e1afdb4cb942432da0d790d
+SHA512 (samba-4.13.6.tar.xz) = 1bb52ecfb7825e6583c23b47dd04e2c8bb59fcb7570815bb26aa782ae572f8fd54a4003c619a178c138fa9cfc761247e959bc67f24946a4d1f048169af2de442
+SHA512 (samba-4.13.6.tar.asc) = b1ba265b74840b18930adc159dc8b57266283ffc11bba63a03f5f177edc2086a7ae8a2e02329d52f9af880c874d25f1ffd0d3462fa1ada500c4a1a95af07adce