diff --git a/build.sh b/build.sh
index 3727ec9..0ffc795 100755
--- a/build.sh
+++ b/build.sh
@@ -320,9 +320,9 @@ if [ "${BUILD_PACKAGE}" != "client" ]; then
 	fi
 fi
 
-PROXMOX_BACKUP_VER="4.0.2-1"
-PROXMOX_BACKUP_GIT="b19d2c393fd8b5d22f1a3aece78a24e0a8745c64"
-PROXMOX_GIT="8a9c280bd8a61562f6ad06972ba06473a44f6857"
+PROXMOX_BACKUP_VER="4.0.5-1"
+PROXMOX_BACKUP_GIT="7616c0a2ed079204c3a333622a0c5ef2b3469350"
+PROXMOX_GIT="a6edf8ecfa4a0766f0af7d2b2241d484f93ca4e9"
 PATHPATTERNS_GIT="42e5e96e30297da878a4d4b3a7fa52b65c1be0ab" # 1.0.0-1
 PXAR_GIT="993c66fcb8819770f279cb9fb4d13f58f367606c"         # 1.0.0-1
 PROXMOX_FUSE_GIT="87dbf9bfef9169286263bccffaae3206635ca108" # 1.0.0-1
@@ -341,6 +341,8 @@ if [ ! -e "${PACKAGES}/proxmox-backup-${BUILD_PACKAGE}_${PROXMOX_BACKUP_VER}_${P
 	sed -i '/dh-cargo\|cargo:native\|rustc:native\|librust-/d' proxmox-backup/debian/control
 	sed -i 's/\(latexmk\|proxmox-widget-toolkit-dev\|python3-sphinx\)/\1:all/' proxmox-backup/debian/control
 	sed -i '/patch.crates-io/,/pxar/s/^#//' proxmox-backup/Cargo.toml
+	# Add missing proxmox-s3-client in 4.0.3-1
+	sed -i '/patch.crates-io/aproxmox-s3-client = { path = "../proxmox/proxmox-s3-client" }' proxmox-backup/Cargo.toml
 	# Add missing proxmox-shared-cache in 3.2.8-1
 	sed -i '/^proxmox-shared-memory.*path/aproxmox-shared-cache = { path = "../proxmox/proxmox-shared-cache" }' proxmox-backup/Cargo.toml
 	patch -p1 -d proxmox-backup/ <"${PATCHES}/proxmox-backup-build.patch"
@@ -353,8 +355,10 @@ if [ ! -e "${PACKAGES}/proxmox-backup-${BUILD_PACKAGE}_${PROXMOX_BACKUP_VER}_${P
 		sed -i "s/x86_64-linux-gnu/aarch64-linux-gnu/" proxmox-backup/debian/proxmox-backup-file-restore.postinst
 		sed -i "s/x86_64-linux-gnu/aarch64-linux-gnu/" proxmox-backup/debian/proxmox-backup-server.install
 	fi
-	[[ "${BUILD_PROFILES}" =~ cross ]] &&
+	if [[ "${BUILD_PROFILES}" =~ cross ]]; then
 		patch -p1 -d proxmox-backup/ <"${PATCHES}/proxmox-backup-cross.patch"
+		sed -i 's/\(xindy\|proxmox-biome\)\b/\1:native/' proxmox-backup/debian/control
+	fi
 	cd proxmox-backup/
 	set_package_info
 	cargo vendor
diff --git a/patches/proxmox-backup-client.patch b/patches/proxmox-backup-client.patch
index ed1fbd0..b2f7f0e 100644
--- a/patches/proxmox-backup-client.patch
+++ b/patches/proxmox-backup-client.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index 461ae3fe..14b33030 100644
+index 51fbd408..d1546dd4 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -5,32 +5,21 @@ PACKAGE := proxmox-backup
@@ -40,7 +40,7 @@ index 461ae3fe..14b33030 100644
  
  SUBCRATES != cargo metadata --no-deps --format-version=1 \
  	| jq -r .workspace_members'[]' \
-@@ -75,8 +64,7 @@ STATIC_CLIENT_DEB=$(PACKAGE)-client-static_$(DEB_VERSION)_$(ARCH).deb
+@@ -79,8 +68,7 @@ STATIC_CLIENT_DEB=$(PACKAGE)-client-static_$(DEB_VERSION)_$(ARCH).deb
  STATIC_CLIENT_DBG_DEB=$(PACKAGE)-client-static-dbgsym_$(DEB_VERSION)_$(ARCH).deb
  DOC_DEB=$(PACKAGE)-docs_$(DEB_VERSION)_all.deb
  
@@ -50,7 +50,7 @@ index 461ae3fe..14b33030 100644
  
  DSC = rust-$(PACKAGE)_$(DEB_VERSION).dsc
  
-@@ -173,31 +161,11 @@ cargo-build:
+@@ -177,31 +165,11 @@ cargo-build:
  
  $(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen &:
  	$(CARGO) build $(CARGO_BUILD_ARGS) \
@@ -71,7 +71,7 @@ index 461ae3fe..14b33030 100644
 -	    --bin proxmox-restore-daemon \
 -	    --package proxmox-backup \
 -	    --bin docgen \
--	    --bin pbs2to3 \
+-	    --bin pbs3to4 \
 -	    --bin proxmox-backup-api \
 -	    --bin proxmox-backup-manager \
 -	    --bin proxmox-backup-proxy \
@@ -83,11 +83,11 @@ index 461ae3fe..14b33030 100644
  	touch "$@"
  
  .PHONY: proxmox-backup-client-static
-@@ -228,20 +196,9 @@ install: $(COMPILED_BINS) $(STATIC_BINS)
+@@ -232,20 +200,9 @@ install: $(COMPILED_BINS) $(STATIC_BINS)
  	$(foreach i,$(USR_SBIN), \
  	    install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(SBINDIR)/ ; \
  	    install -m644 zsh-completions/_$(i) $(DESTDIR)$(ZSH_COMPL_DEST)/ ;)
--	install -m755 $(COMPILEDIR)/pbs2to3 $(DESTDIR)$(SBINDIR)/
+-	install -m755 $(COMPILEDIR)/pbs3to4 $(DESTDIR)$(SBINDIR)/
 -	install -dm755 $(DESTDIR)$(LIBEXECDIR)/proxmox-backup
 -	install -dm755 $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/file-restore
 -	$(foreach i,$(RESTORE_BIN), \
@@ -105,11 +105,11 @@ index 461ae3fe..14b33030 100644
  .PHONY: upload
  upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
 diff --git a/debian/control b/debian/control
-index a9040a3a..a19c33b8 100644
+index f9d70b25..e63d9d12 100644
 --- a/debian/control
 +++ b/debian/control
-@@ -20,7 +20,7 @@ Build-Depends: bash-completion,
-                pve-eslint:all (>= 7.18.0~),
+@@ -19,7 +19,7 @@ Build-Depends: bash-completion,
+                proxmox-widget-toolkit-dev:all <!nodoc>,
                 python3-docutils,
                 python3-pygments,
 -               python3-sphinx:all <!nodoc>,
@@ -117,7 +117,7 @@ index a9040a3a..a19c33b8 100644
                 rsync,
                 texlive-fonts-extra <!nodoc>,
                 texlive-fonts-recommended <!nodoc>,
-@@ -35,35 +35,6 @@ Vcs-Browser: https://git.proxmox.com/?p=proxmox-backup.git;a=summary
+@@ -33,35 +33,6 @@ Vcs-Browser: https://git.proxmox.com/?p=proxmox-backup.git;a=summary
  Homepage: https://www.proxmox.com
  Rules-Requires-Root: binary-targets
  
@@ -128,7 +128,7 @@ index a9040a3a..a19c33b8 100644
 -         libjs-extjs (>= 7~),
 -         libjs-qrcodejs (>= 1.20201119),
 -         libproxmox-acme-plugins,
--         libsgutils2-1.46-2,
+-         libsgutils2-1.48,
 -         libzstd1 (>= 1.3.8),
 -         lvm2,
 -         openssh-server,
@@ -153,7 +153,7 @@ index a9040a3a..a19c33b8 100644
  Package: proxmox-backup-client
  Architecture: any
  Depends: qrencode, ${misc:Depends}, ${shlibs:Depends},
-@@ -78,21 +49,3 @@ Conflicts: proxmox-backup-client,
+@@ -76,21 +47,3 @@ Conflicts: proxmox-backup-client,
  Description: Proxmox Backup Client tools (statically linked)
   This package contains the Proxmox Backup client, which provides a
   simple command line tool to create and restore backups.
@@ -176,10 +176,10 @@ index a9040a3a..a19c33b8 100644
 - restoring individual files and folders from both host/container and VM/block
 - device backups. It includes a block device restore driver using QEMU.
 diff --git a/debian/rules b/debian/rules
-index 176720e3..5c203bc9 100755
+index 723b714f..07299c88 100755
 --- a/debian/rules
 +++ b/debian/rules
-@@ -42,11 +42,6 @@ override_dh_auto_install:
+@@ -55,11 +55,6 @@ override_dh_auto_install:
  	mv debian/tmp/usr/bin/proxmox-backup-client-static debian/proxmox-backup-client-static/usr/bin/proxmox-backup-client
  	mv debian/tmp/usr/bin/pxar-static debian/proxmox-backup-client-static/usr/bin/pxar
  
@@ -192,10 +192,10 @@ index 176720e3..5c203bc9 100755
  	dh_fixperms --exclude sg-tape-cmd
  
 diff --git a/docs/Makefile b/docs/Makefile
-index c57cbbc2..1631bbb8 100644
+index 5cf5fc17..9aac52e8 100644
 --- a/docs/Makefile
 +++ b/docs/Makefile
-@@ -1,59 +1,18 @@
+@@ -1,59 +1,17 @@
  include ../defines.mk
  
  GENERATED_SYNOPSIS := 						\
@@ -215,7 +215,7 @@ index c57cbbc2..1631bbb8 100644
 -	pmt/synopsis.rst					\
 -	pmtx/synopsis.rst					\
  	proxmox-backup-client/catalog-shell-synopsis.rst 	\
- 	proxmox-backup-client/synopsis.rst			\
+-	proxmox-backup-client/synopsis.rst			\
 -	proxmox-backup-debug/synopsis.rst			\
 -	proxmox-backup-manager/synopsis.rst			\
 -	proxmox-file-restore/synopsis.rst			\
@@ -223,7 +223,7 @@ index c57cbbc2..1631bbb8 100644
  	pxar/synopsis.rst					\
  
  MAN1_PAGES := 				\
--	pbs2to3.1			\
+-	pbs3to4.1			\
 -	pmt.1				\
 -	pmtx.1				\
  	proxmox-backup-client.1		\