diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 048b22bc43..a2e480cc32 100755
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -966,6 +966,18 @@ Available commands:
 		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,1]=0
 		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,2]=0
 		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,10]=0
+		#------------------
+		software_id=208
+		aSOFTWARE_NAME[$software_id]='Sunshine'
+		aSOFTWARE_DESC[$software_id]='Self-hosted game stream host for Moonlight'
+		aSOFTWARE_CATX[$software_id]=5
+		aSOFTWARE_DOCS[$software_id]='https://dietpi.com/docs/software/gaming/#sunshine'
+		# ARM64 and AMD64 only
+		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,1]=0
+		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,2]=0
+		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,11]=0
+		# Bullseye only
+		(( $G_DISTRO == 6 )) || aSOFTWARE_AVAIL_G_DISTRO[$software_id,$G_DISTRO]=0
 
 		# Social & Search
 		#--------------------------------------------------------------------------------
@@ -11103,6 +11115,16 @@ _EOF_
 			modprobe binfmt_misc 2> /dev/null && G_EXEC systemctl restart systemd-binfmt
 		fi
 
+		if To_Install 208 # Sunshine
+		then
+			case $G_HW_ARCH in
+				3) local arch='arm64';;
+				10) local arch='amd64';;
+				*) G_WHIP_MSG "[FAILED] Wrong Arch";;
+			esac
+			Download_Install "https://github.com/LizardByte/Sunshine/releases/download/v0.19.1/sunshine-debian-${G_DISTRO_NAME}-${arch}.deb"
+		fi
+
 		if To_Install 27 # TasmoAdmin
 		then
 			# Install required PHP modules
@@ -12689,6 +12711,11 @@ If no WireGuard (auto)start is included, but you require it, please do the follo
 			[[ -d '/usr/lib/x86_64-linux-gnu' ]] && G_EXEC rmdir --ignore-fail-on-non-empty /usr/lib/x86_64-linux-gnu
 		fi
 
+		if To_Uninstall 208 # Sunshine
+		then
+			G_AGP sunshine
+		fi
+
 		if To_Uninstall 119 # CAVA
 		then
 			G_AGP cava