diff --git a/Mage.Sets/src/mage/cards/c/CityInABottle.java b/Mage.Sets/src/mage/cards/c/CityInABottle.java
index 675f0d796c..00a469b756 100644
--- a/Mage.Sets/src/mage/cards/c/CityInABottle.java
+++ b/Mage.Sets/src/mage/cards/c/CityInABottle.java
@@ -97,7 +97,7 @@ public final class CityInABottle extends CardImpl {
         namePredicatesArabianNights.add(new NamePredicate("Jandor's Saddlebags"));
         namePredicatesArabianNights.add(new NamePredicate("Jeweled Bird"));
         namePredicatesArabianNights.add(new NamePredicate("Jihad"));
-        namePredicatesArabianNights.add(new NamePredicate("Junún Efreet"));
+        namePredicatesArabianNights.add(new NamePredicate("Junun Efreet"));
         namePredicatesArabianNights.add(new NamePredicate("Juzam Djinn"));
         namePredicatesArabianNights.add(new NamePredicate("Khabal Ghoul"));
         namePredicatesArabianNights.add(new NamePredicate("King Suleiman"));
diff --git a/Mage.Sets/src/mage/cards/j/JununEfreet.java b/Mage.Sets/src/mage/cards/j/JununEfreet.java
index e80a514ea8..7490820e05 100644
--- a/Mage.Sets/src/mage/cards/j/JununEfreet.java
+++ b/Mage.Sets/src/mage/cards/j/JununEfreet.java
@@ -27,7 +27,7 @@ public final class JununEfreet extends CardImpl {
 
         // Flying
         this.addAbility(FlyingAbility.getInstance());
-        // At the beginning of your upkeep, sacrifice Junún Efreet unless you pay {B}{B}.
+        // At the beginning of your upkeep, sacrifice Junun Efreet unless you pay {B}{B}.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{B}{B}")), TargetController.YOU, false));
     }
 
diff --git a/Mage.Sets/src/mage/sets/ArabianNights.java b/Mage.Sets/src/mage/sets/ArabianNights.java
index ce09fa0d56..7776d5f2bb 100644
--- a/Mage.Sets/src/mage/sets/ArabianNights.java
+++ b/Mage.Sets/src/mage/sets/ArabianNights.java
@@ -82,7 +82,7 @@ public final class ArabianNights extends ExpansionSet {
         cards.add(new SetCardInfo("Jandor's Ring", 64, Rarity.RARE, mage.cards.j.JandorsRing.class));
         cards.add(new SetCardInfo("Jandor's Saddlebags", 65, Rarity.RARE, mage.cards.j.JandorsSaddlebags.class));
         cards.add(new SetCardInfo("Jihad", 5, Rarity.RARE, mage.cards.j.Jihad.class));
-        cards.add(new SetCardInfo("Junún Efreet", 28, Rarity.RARE, mage.cards.j.JununEfreet.class));
+        cards.add(new SetCardInfo("Junun Efreet", 28, Rarity.RARE, mage.cards.j.JununEfreet.class));
         cards.add(new SetCardInfo("Juzam Djinn", 29, Rarity.RARE, mage.cards.j.JuzamDjinn.class));
         cards.add(new SetCardInfo("Khabal Ghoul", 30, Rarity.UNCOMMON, mage.cards.k.KhabalGhoul.class));
         cards.add(new SetCardInfo("King Suleiman", 6, Rarity.RARE, mage.cards.k.KingSuleiman.class));
diff --git a/Mage.Sets/src/mage/sets/FourthEdition.java b/Mage.Sets/src/mage/sets/FourthEdition.java
index d2a8b86844..45b1950075 100644
--- a/Mage.Sets/src/mage/sets/FourthEdition.java
+++ b/Mage.Sets/src/mage/sets/FourthEdition.java
@@ -205,7 +205,7 @@ public final class FourthEdition extends ExpansionSet {
         cards.add(new SetCardInfo("Jandor's Saddlebags", 330, Rarity.RARE, mage.cards.j.JandorsSaddlebags.class));
         cards.add(new SetCardInfo("Jayemdae Tome", 331, Rarity.RARE, mage.cards.j.JayemdaeTome.class));
         cards.add(new SetCardInfo("Jump", 79, Rarity.COMMON, mage.cards.j.Jump.class));
-        cards.add(new SetCardInfo("Jun?n Efreet", 143, Rarity.UNCOMMON, mage.cards.j.JununEfreet.class));
+        cards.add(new SetCardInfo("Junun Efreet", 143, Rarity.UNCOMMON, mage.cards.j.JununEfreet.class));
         cards.add(new SetCardInfo("Karma", 32, Rarity.UNCOMMON, mage.cards.k.Karma.class));
         cards.add(new SetCardInfo("Keldon Warlord", 207, Rarity.UNCOMMON, mage.cards.k.KeldonWarlord.class));
         cards.add(new SetCardInfo("Killer Bees", 254, Rarity.UNCOMMON, mage.cards.k.KillerBees.class));
diff --git a/Mage.Sets/src/mage/sets/MastersEditionIV.java b/Mage.Sets/src/mage/sets/MastersEditionIV.java
index 3a2f6c7ee1..8658d66d9b 100644
--- a/Mage.Sets/src/mage/sets/MastersEditionIV.java
+++ b/Mage.Sets/src/mage/sets/MastersEditionIV.java
@@ -158,7 +158,7 @@ public final class MastersEditionIV extends ExpansionSet {
         cards.add(new SetCardInfo("Island Sanctuary", 15, Rarity.RARE, mage.cards.i.IslandSanctuary.class));
         cards.add(new SetCardInfo("Jade Monolith", 208, Rarity.RARE, mage.cards.j.JadeMonolith.class));
         cards.add(new SetCardInfo("Juggernaut", 209, Rarity.UNCOMMON, mage.cards.j.Juggernaut.class));
-        cards.add(new SetCardInfo("Junún Efreet", 88, Rarity.UNCOMMON, mage.cards.j.JununEfreet.class));
+        cards.add(new SetCardInfo("Junun Efreet", 88, Rarity.UNCOMMON, mage.cards.j.JununEfreet.class));
         cards.add(new SetCardInfo("Just Fate", 16, Rarity.COMMON, mage.cards.j.JustFate.class));
         cards.add(new SetCardInfo("Kismet", 17, Rarity.RARE, mage.cards.k.Kismet.class));
         cards.add(new SetCardInfo("Kormus Bell", 210, Rarity.RARE, mage.cards.k.KormusBell.class));
diff --git a/Mage/src/main/java/mage/cards/decks/importer/TxtDeckImporter.java b/Mage/src/main/java/mage/cards/decks/importer/TxtDeckImporter.java
index 23777e60a0..14d2b31f57 100644
--- a/Mage/src/main/java/mage/cards/decks/importer/TxtDeckImporter.java
+++ b/Mage/src/main/java/mage/cards/decks/importer/TxtDeckImporter.java
@@ -92,6 +92,7 @@ public class TxtDeckImporter extends DeckImporter {
                 .replace("í", "i")
                 .replace("â", "a")
                 .replace("á", "a")
+                .replace("ú", "u")
                 .replace("\"", "'");
         if (lineName.contains("//") && !lineName.contains(" // ")) {
             lineName = lineName.replace("//", " // ");