diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 58fb024fe1..3d6fccfdc0 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -9,6 +9,7 @@ Changes / Improvements / Optimisations:
 - DietPi-Software | WireGuard: Switched from 10.8.0.0 to 10.9.0.0 IP addresses on fresh installs, to avoid IP double use with OpenVPN. Thanks to @XRay437 for pointing this out: https://github.com/Fourdee/DietPi/issues/2491#issuecomment-461366739
 - DietPi-Software | WireGuard: Changed the way users are adviced to add multiple clients, to enhance concurrent connections. Thanks to @curiosity-seeker for reporting and testing this issue: https://github.com/Fourdee/DietPi/issues/2491#issuecomment-462419860
 - DietPi-Software | Aria2: Tweaked settings to enhance 3rd party plugin support and removed deprecated/doubled entries. Many thanks to @msongz for the commit: https://github.com/Fourdee/DietPi/pull/2538
+- DietPi-Software | UrBackup: Updated installed version to 2.3.7. Thanks to @DeathIsUnknown for the information: https://github.com/Fourdee/DietPi/issues/2577
 
 Bug Fixes:
 - General | Resolved an issue where /etc/bashrc.d entries could be run multiple times. Many thanks to @jonare77 for reporting this: https://github.com/Fourdee/DietPi/issues/2529
diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 0a3696af95..e78034f493 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -1069,7 +1069,7 @@ _EOF_
 		aSOFTWARE_REQUIRES_WEBSERVER[$software_id]=1
 			  aSOFTWARE_REQUIRES_PHP[$software_id]=1
 			aSOFTWARE_REQUIRES_MYSQL[$software_id]=1
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=1064#p1064'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=1064#p1064'
 
 		#------------------
 		software_id=111
@@ -1078,7 +1078,7 @@ _EOF_
 				 aSOFTWARE_WHIP_DESC[$software_id]='full system backup server'
 			aSOFTWARE_CATEGORY_INDEX[$software_id]=4
 					  aSOFTWARE_TYPE[$software_id]=0
-			 aSOFTWARE_ONLINEDOC_URL[$software_id]='f=8&t=5&p=65#p65'
+			 aSOFTWARE_ONLINEDOC_URL[$software_id]='p=65#p65'
 
 		# No deb packages for ARMv6:
 		aSOFTWARE_AVAIL_G_HW_ARCH[$software_id,1]=0
@@ -4125,28 +4125,27 @@ _EOF_
 
 		fi
 
-		#urbackup server
-		software_id=111
+		software_id=111 # UrBackup Server
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
 			Banner_Installing
 
-			if (( $G_HW_ARCH == 10 )); then
-
-				INSTALL_URL_ADDRESS='https://hndl.urbackup.org/Server/2.2.11/urbackup-server_2.2.11_amd64.deb'
+			# ARMv7
+			INSTALL_URL_ADDRESS='https://hndl.urbackup.org/Server/2.3.7/urbackup-server_2.3.7_armhf.deb'
 
-			elif (( $G_HW_ARCH == 2 )); then
+			# x86_64
+			if (( $G_HW_ARCH == 10 )); then
 
-				INSTALL_URL_ADDRESS='https://hndl.urbackup.org/Server/2.2.11/urbackup-server_2.2.11_armhf.deb'
+				INSTALL_URL_ADDRESS='https://hndl.urbackup.org/Server/2.3.7/urbackup-server_2.3.7_amd64.deb'
 
-			#ARMv8 sourcebuild
+			# ARMv8 source
 			elif (( $G_HW_ARCH == 3 )); then
 
-				INSTALL_URL_ADDRESS='https://hndl.urbackup.org/Server/2.2.11/urbackup-server-2.2.11.tar.gz'
+				INSTALL_URL_ADDRESS='https://hndl.urbackup.org/Server/2.3.7/urbackup-server-2.3.7.tar.gz'
 
 			fi
 
-			#ARMv8 source build
+			# ARMv8 source build
 			if (( $G_HW_ARCH == 3 )); then
 
 				DEPS_LIST='build-essential zlib1g-dev libcurl4-openssl-dev libcrypto++-dev sqlite3'
@@ -4166,7 +4165,7 @@ _EOF_
 				cd /tmp/$G_PROGRAM_NAME
 				rm -R urbackup-server-*
 
-			#Deb
+			# Deb
 			else
 
 				debconf-set-selections <<< "urbackup-server urbackup/backuppath string $G_FP_DIETPI_USERDATA/urbackup"
@@ -11259,18 +11258,17 @@ _EOF_
 
 		fi
 
-		#Urbackup server
-		software_id=111
+		software_id=111 # UrBackup Server
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == 1 )); then
 
 			Banner_Configuration
 
 			mkdir -p $G_FP_DIETPI_USERDATA/urbackup/urbackup_tmp_files
 
-			#As we have /tmp mounted to RAM, change tmp locations
+			# As we have /tmp mounted to RAM, change tmp locations
 			sed -i '/DAEMON_TMPDIR=/c\DAEMON_TMPDIR="/var/tmp"' /etc/default/urbackupsrv
 
-			#https://github.com/Fourdee/DietPi/issues/545#issuecomment-252419739
+			# https://github.com/Fourdee/DietPi/issues/545#issuecomment-252419739
 			#sqlite3 /usr/local/var/urbackup/backup_server_settings.db "UPDATE settings SET value = '/mnt/dietpi_userdata/urbackup/' WHERE key = 'backupfolder'"
 
 		fi
@@ -14469,20 +14467,20 @@ _EOF_
 
 		fi
 
-		software_id=111
+		software_id=111 # UrBackup Server
 		if (( ${aSOFTWARE_INSTALL_STATE[$software_id]} == -1 )); then
 
 			Banner_Uninstalling
 			G_AGP urbackup-server
 
-			#+sourcebuild
-			rm /etc/systemd/system/urbackupsrv.service
-			rm /etc/default/urbackupsrv
-			rm /etc/logrotate.d/urbackupsrv
-			rm /usr/sbin/urbackupsrv
-			rm /usr/bin/urbackup_snapshot_helper
-			rm /usr/bin/urbackupsrv
-			rm -R /usr/share/urbackup
+			# +sourcebuild
+			[[ -f /etc/systemd/system/urbackupsrv.service ]] && rm /etc/systemd/system/urbackupsrv.service
+			[[ -f /etc/default/urbackupsrv ]] && rm /etc/default/urbackupsrv
+			[[ -f /etc/logrotate.d/urbackupsrv ]] && rm /etc/logrotate.d/urbackupsrv
+			[[ -f /usr/sbin/urbackupsrv ]] && rm /usr/sbin/urbackupsrv
+			[[ -f /usr/bin/urbackup_snapshot_helper ]] && rm /usr/bin/urbackup_snapshot_helper
+			[[ -f /usr/bin/urbackupsrv ]] && rm /usr/bin/urbackupsrv
+			[[ -d /usr/share/urbackup ]] && rm -R /usr/share/urbackup
 
 		fi