diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm
index b269563dfe6..acc4997b369 100644
--- a/code/modules/projectiles/guns/projectile/sniper.dm
+++ b/code/modules/projectiles/guns/projectile/sniper.dm
@@ -226,7 +226,9 @@
 
 /obj/item/gun/projectile/automatic/rifle/w556
 	name = "scout rifle"
-	desc = "A lightweight Neyland 556mi 'Ranger' used within the Sol Navy and Nanotrasen Emergency Response Teams. Equipped with a scope and designed for medium to long range combat, with moderate stopping power. Chambered in 5.56 rounds."
+	desc = "The Z8M variant of the Bulldog carbine, made by the now defunct Zendai Foundries. \
+	Features a longer, heavier barrel and low-power fixed-magnification optic in lieu of the grenade launcher. \
+	A vertical grip has been attached under the forend to help offset the change in balance and improve handling. Uses 5.56mm rounds."
 	icon = 'icons/obj/guns/w556.dmi'
 	icon_state = "w556rifle"
 	item_state = "w556rifle"
@@ -247,12 +249,21 @@
 	recoil_wielded = 2
 	accuracy_wielded = 1
 	multi_aim = 0 //Definitely a fuck no. Being able to target one person at this range is plenty.
+	auto_eject = 1
+	auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
 
 	firemodes = list(
 		list(mode_name="semiauto", burst=1, fire_delay=0),
 		list(mode_name="2-round bursts", burst=2, burst_accuracy=list(0,-1,-1), dispersion=list(0, 8))
 		)
 
+/obj/item/gun/projectile/automatic/rifle/w556/update_icon()
+	..()
+	if(ammo_magazine)
+		icon_state = "w556rifle"
+	else
+		icon_state = "w556rifle-empty"
+
 /obj/item/gun/projectile/automatic/rifle/w556/verb/scope()
 	set category = "Object"
 	set name = "Use Scope"
diff --git a/html/changelogs/bluntforce420-scoutrifle.yml b/html/changelogs/bluntforce420-scoutrifle.yml
new file mode 100644
index 00000000000..9bdeb6a903b
--- /dev/null
+++ b/html/changelogs/bluntforce420-scoutrifle.yml
@@ -0,0 +1,43 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: BLUNTFORCE420
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Resprited and rewrote the Scout Rifle to be a variant of the existing bullpup carbine. Also fixed the icon states so the empty rifle works properly."
+  - balance: "Gave the scout rifle automatic magazine ejection on empty, like the bullpup carbine."
+
diff --git a/icons/obj/guns/w556.dmi b/icons/obj/guns/w556.dmi
index c6d61a28da9..94c132236bb 100644
Binary files a/icons/obj/guns/w556.dmi and b/icons/obj/guns/w556.dmi differ