diff --git a/code/game/dna/genes/goon_disabilities.dm b/code/game/dna/genes/goon_disabilities.dm
index 1cb70e2c236..fc4dde9bca2 100644
--- a/code/game/dna/genes/goon_disabilities.dm
+++ b/code/game/dna/genes/goon_disabilities.dm
@@ -119,7 +119,17 @@
 
 	OnSay(var/mob/M, var/message)
 		// svedish
-		message = replacetext(message,"w","v")
+		message = replacetextEx(message,"w","v")
+		message = replacetextEx(message,"W","V")
+		message = replacetextEx(message,"J","Y")
+		message = replacetextEx(message,"j","y")
+		message = replacetextEx(message,"a",pick("å","ä","æ","a"))
+		message = replacetextEx(message,"A",pick("Å","Ä","Æ","A"))
+		message = replacetextEx(message,"bo","bjo")
+		message = replacetextEx(message,"BO","BJO")
+		message = replacetextEx(message,"Bo","Bjo")
+		message = replacetextEx(message,"o",pick("ö","ø","o"))
+		message = replacetextEx(message,"O",pick("Ö","Ø","O"))
 		if(prob(30))
 			message += " Bork[pick("",", bork",", bork, bork")]!"
 		return message