diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7ce8b6b1d3..c071b805b2 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,6 +2,7 @@ v129
 (xx/08/16)
 
 Changes / Improvements / Optimizations:
+#DietPi-Software | uae4arm | :https://github.com/Fourdee/DietPi/issues/474
 DietPi-Software | rTorrent + ruTorrent | is now available for installation in the DietPi optimized software menu. Many thanks to Ardakilic for his input, and, help make this possible: https://github.com/Fourdee/DietPi/issues/176
 DietPi-Software | Owncloud installation updated to latest stable (9.1): https://github.com/Fourdee/DietPi/issues/468
 DietPi-Software | Added 'autoconf automake' packages to Build-Essential installation.
diff --git a/dietpi/dietpi-process_tool b/dietpi/dietpi-process_tool
index 1f125eff70..b7d4df87b1 100644
--- a/dietpi/dietpi-process_tool
+++ b/dietpi/dietpi-process_tool
@@ -228,6 +228,7 @@
 		aNAME[$index]="Squeezebox Lite";aPROCESS_NAME[$index]="squeezelite";((index++))
 		aNAME[$index]="Syncthing";aPROCESS_NAME[$index]="syncthing";((index++))
 		aNAME[$index]="Transmission";aPROCESS_NAME[$index]="transmission-daemon";((index++))
+		aNAME[$index]="Uae4Arm-RPi";aPROCESS_NAME[$index]="uae4arm-rpi";((index++))
 		aNAME[$index]="Webserver Apache2";aPROCESS_NAME[$index]="apache2";((index++))
 		aNAME[$index]="Webserver Nginx";aPROCESS_NAME[$index]="nginx";((index++))
 		aNAME[$index]="Webserver Lighttpd";aPROCESS_NAME[$index]="lighttpd";((index++))
diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index a07b6e3e63..374d679027 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -707,8 +707,25 @@ _EOF_
 
 		#------------------
 
-		#Gaming
+		#Emulation / Gaming
 		#--------------------------------------------------------------------------------
+		index_current=108
+
+				 aSOFTWARE_WHIP_NAME[$index_current]='Uae4Arm'
+				 aSOFTWARE_WHIP_DESC[$index_current]='amiga emulator'
+			aSOFTWARE_CATEGORY_INDEX[$index_current]=5
+					  aSOFTWARE_TYPE[$index_current]=0
+			 aSOFTWARE_REQUIRES_ALSA[$index_current]=1
+
+		# - Disabled for All non-rpi
+		for ((i=10; i<=$MAX_HW_MODEL; i++))
+		do
+
+			aSOFTWARE_AVAIL_HW_MODEL[$index_current,$i]=0
+
+		done
+
+		#------------------
 		index_current=51
 
 				 aSOFTWARE_WHIP_NAME[$index_current]='OpenTyrian'
@@ -2727,6 +2744,33 @@ _EOF_
 
 		fi
 
+		#uae4arm
+		INSTALLING_INDEX=108
+		if (( ${aSOFTWARE_INSTALL_STATE[$INSTALLING_INDEX]} == 1 )); then
+
+			Banner_Installing
+
+			INSTALL_URL_ADDRESS='http://dietpi.com/downloads/binaries/all/uae4arm-rpi_v1.zip'
+			/DietPi/dietpi/func/check_connection "$INSTALL_URL_ADDRESS"
+
+			#Install
+			if (( $? == 0 )); then
+
+				AGI alsa-oss joystick libsdl-image1.2 libsdl-ttf2.0-0 libsdl-gfx1.2-5 libguichan-0.8.1-1 libguichan-allegro-0.8.1-1 libguichan-sdl-0.8.1-1 libguichan-opengl-0.8.1-1 libjpgalleg4.4 libxml2 libmpg123-0
+
+				#Download binaries
+				wget "$INSTALL_URL_ADDRESS" -O package.zip
+				unzip package.zip -d /etc
+				rm package.zip
+
+			else
+
+				Error_NoConnection_NoInstall
+
+			fi
+
+		fi
+
 		#OpenTyrian
 		INSTALLING_INDEX=51
 		if (( ${aSOFTWARE_INSTALL_STATE[$INSTALLING_INDEX]} == 1 )); then
@@ -5420,6 +5464,63 @@ _EOF_
 
 		fi
 
+		#uae4arm
+		INSTALLING_INDEX=108
+		if (( ${aSOFTWARE_INSTALL_STATE[$INSTALLING_INDEX]} == 1 )); then
+
+			#4.1.21 https://github.com/Hexxeh/rpi-firmware/commit/4bc6b67905e3206f8cf4d9a316f3343aaaf14d62
+			# AGI rpi-update #4.4 hangs uae4arm.
+			# rpi-update 4bc6b67905e3206f8cf4d9a316f3343aaaf14d62
+
+			#Allow binary execution
+			chmod +x /etc/uae4arm-rpi/uae4arm*
+
+			#Create userdata/rom directories
+			mkdir -p "$DIETPI_USERDATA_DIRECTORY"/uae4arm-rpi
+			mv /etc/uae4arm-rpi/kickstarts "$DIETPI_USERDATA_DIRECTORY"/uae4arm-rpi/
+
+			#Symlink HW specific binary for this system to /etc/uae4arm-rpi/uae4arm-rpi
+			local uae_filename=''
+
+			# - RPi 3
+			if (( $HW_MODEL == 3 )); then
+
+				uae_filename='uae4arm-rpi3'
+
+			# - RPi 2
+			elif (( $HW_MODEL == 2 )); then
+
+				uae_filename='uae4arm-rpi2'
+
+			# - Assume RPi 1 (ARMv6)
+			else
+
+				uae_filename='uae4arm-rpi1'
+
+			fi
+
+			ln -sf /etc/uae4arm-rpi/"$uae_filename" /etc/uae4arm-rpi/uae4arm-rpi
+
+			#service
+			cat << _EOF_ > /etc/systemd/system/uae4arm-rpi.service
+[Unit]
+Description=UAE4Arm Amiga Emulator
+DefaultDependencies=no
+After=dietpi-service.service
+
+[Service]
+ExecStart=/bin/bash -c "cd /etc/uae4arm-rpi/ && ./uae4arm-rpi -f conf/autostart.uae"
+ExecStop=/usr/bin/killall -w -s SIGKILL uae4arm-rpi #SIGKILL for testing, endless wait on sigterm
+
+[Install]
+WantedBy=local-fs.target
+_EOF_
+
+			systemctl enable uae4arm-rpi.service #Enabled for testing.
+			#Still thinking out how I want this implimented, move to dietpi-autostart?
+
+		fi
+
 		#OpenTyrian
 		INSTALLING_INDEX=51
 		if (( ${aSOFTWARE_INSTALL_STATE[$INSTALLING_INDEX]} == 1 )); then
@@ -7789,6 +7890,11 @@ _EOF_
 			#	apache2
 			rm /etc/apache2/sites-available/rutorrent.conf
 
+		elif (( $1 == 108 )); then
+
+			rm -R /etc/uae4arm-rpi
+			rm /etc/systemd/system/uae4arm-rpi.service
+
 		#----------------------------------------------------------------------
 		#LINUX SOFTWARE