diff --git a/.gitignore b/.gitignore
index ed06971..21c8372 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/samba-4.20.4.tar.xz
-SOURCES/samba-4.20.4.tar.asc
+SOURCES/samba-4.20.5.tar.xz
+SOURCES/samba-4.20.5.tar.asc
diff --git a/.samba.metadata b/.samba.metadata
index 15d7d65..a6d7c8a 100644
--- a/.samba.metadata
+++ b/.samba.metadata
@@ -1,2 +1,2 @@
-593b3ecb0ba3af611683fab819f74c6dffe9896b SOURCES/samba-4.20.4.tar.xz
-f0cc98c52f167324860d2c751b5fef8f6dee6d45 SOURCES/samba-4.20.4.tar.asc
+1632ba54244747cb257712d1589181899af5cf65 SOURCES/samba-4.20.5.tar.xz
+fec190397013f3e4f242fc57db6481daed0b1b7f SOURCES/samba-4.20.5.tar.asc
diff --git a/SPECS/samba.spec b/SPECS/samba.spec
index 2959f2e..660ee34 100644
--- a/SPECS/samba.spec
+++ b/SPECS/samba.spec
@@ -110,7 +110,7 @@
 
 %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.20.4
+%global samba_version 4.20.5
 %global baserelease 100
 # This should be rc1 or %%nil
 %global pre_release %nil
@@ -1389,6 +1389,7 @@ rm -f %{buildroot}%{_mandir}/man8/vfs_glusterfs.8*
 
 %if %{without vfs_cephfs}
 rm -f %{buildroot}%{_mandir}/man8/vfs_ceph.8*
+rm -f %{buildroot}%{_mandir}/man8/vfs_ceph_new.8*
 rm -f %{buildroot}%{_mandir}/man8/vfs_ceph_snapshots.8*
 %endif
 
@@ -1603,6 +1604,9 @@ fi
 %{_libdir}/samba/vfs/btrfs.so
 %{_libdir}/samba/vfs/cap.so
 %{_libdir}/samba/vfs/catia.so
+%if %{with vfs_cephfs}
+%{_libdir}/samba/vfs/ceph_snapshots.so
+%endif
 %{_libdir}/samba/vfs/commit.so
 %{_libdir}/samba/vfs/crossrename.so
 %{_libdir}/samba/vfs/default_quota.so
@@ -1669,6 +1673,9 @@ fi
 %{_mandir}/man8/vfs_btrfs.8*
 %{_mandir}/man8/vfs_cap.8*
 %{_mandir}/man8/vfs_catia.8*
+%if %{with vfs_cephfs}
+%{_mandir}/man8/vfs_ceph_snapshots.8*
+%endif
 %{_mandir}/man8/vfs_commit.8*
 %{_mandir}/man8/vfs_crossrename.8*
 %{_mandir}/man8/vfs_default_quota.8*
@@ -2254,9 +2261,9 @@ fi
 %if %{with vfs_cephfs}
 %files vfs-cephfs
 %{_libdir}/samba/vfs/ceph.so
-%{_libdir}/samba/vfs/ceph_snapshots.so
+%{_libdir}/samba/vfs/ceph_new.so
 %{_mandir}/man8/vfs_ceph.8*
-%{_mandir}/man8/vfs_ceph_snapshots.8*
+%{_mandir}/man8/vfs_ceph_new.8*
 %endif
 
 ### VFS-IOURING
@@ -4521,6 +4528,9 @@ fi
 %endif
 
 %changelog
+* Fri Sep 20 2024 - Anoop C S <anoopcs@samba.org> - 4.20.5-100
+- v4.20.5 GA
+
 * Mon Aug 12 2024 - Anoop C S <anoopcs@samba.org> - 4.20.4-100
 - v4.20.4 GA