diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 91aeb4e842..da20ca12bd 100755
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -312,6 +312,16 @@ Available commands:
 		# - RISC-V & ARMv6: https://github.com/rustdesk/rustdesk-server/releases
 		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,1]=0
 		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,11]=0
+		#------------------
+		software_id=13
+		aSOFTWARE_NAME[$software_id]='RustDesk Client'
+		aSOFTWARE_DESC[$software_id]='open-source remote desktop client, written in Rust'
+		aSOFTWARE_CATX[$software_id]=1
+		aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/remote_desktop/#rustdesk-client'
+		aSOFTWARE_DEPS[$software_id]='6'
+		# - RISC-V & ARMv6: https://github.com/rustdesk/rustdesk/releases
+		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,1]=0
+		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,11]=0
 
 		# Media Systems
 		#--------------------------------------------------------------------------------
@@ -12304,6 +12314,19 @@ _EOF_
 			unset -v rd_inst rd_data
 		fi
 
+		if To_Install 13 # RustDesk Client
+		then
+			case "$G_HW_ARCH" in
+				2) local arch='armv7-sciter';;
+				3) local arch='aarch64';;
+				*) local arch='x86_64';;
+			esac
+
+			local fallback_url="https://github.com/rustdesk/rustdesk/releases/download/1.4.5/rustdesk-1.4.5-$arch.deb"
+			Download_Install "$(curl -sSfL 'https://api.github.com/repos/rustdesk/rustdesk/releases/latest' | mawk -F\" "/^ *\"browser_download_url\": \".*\/rustdesk-[^\"\/]*-$arch\.deb\"$/{print \$4}")"
+			unset -v arch
+		fi
+
 		if To_Install 176 uptime-kuma # Uptime Kuma: https://github.com/louislam/uptime-kuma/wiki/🔧-How-to-Install#-non-docker
 		then
 			local opt='/opt/uptime-kuma' mnt='/mnt/dietpi_userdata/uptime-kuma'
@@ -14465,6 +14488,11 @@ _EOF_
 			G_EXEC rm -Rf /mnt/dietpi_userdata/rustdesk
 		fi
 
+		if To_Uninstall 13 # RustDesk Client
+		then
+			G_AGP rustdesk
+		fi
+
 		if To_Uninstall 176 # Uptime Kuma
 		then
 			Remove_Service uptime-kuma 1 1