diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java
index ccd3c37645..3eb626d4e4 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/GathererSets.java
@@ -39,6 +39,7 @@ public class GathererSets implements Iterable<DownloadJob> {
         symbolsReplacements.put("VIS", "VI");
         symbolsReplacements.put("MIR", "MI");
         symbolsReplacements.put("7ED", "7E");
+        symbolsReplacements.put("6ED", "6E");
     }
 
     public GathererSets(String path) {
diff --git a/Mage.Sets/src/mage/sets/Sets.java b/Mage.Sets/src/mage/sets/Sets.java
index f38481b170..9beaad0b19 100644
--- a/Mage.Sets/src/mage/sets/Sets.java
+++ b/Mage.Sets/src/mage/sets/Sets.java
@@ -121,6 +121,7 @@ public class Sets extends HashMap<String, ExpansionSet> {
         this.addSet(SeventhEdition.getInstance());
         this.addSet(ShardsOfAlara.getInstance());
         this.addSet(Shadowmoor.getInstance());
+        this.addSet(SixthEdition.getInstance());
         this.addSet(Stronghold.getInstance());
         this.addSet(Tenth.getInstance());
         this.addSet(Tempest.getInstance());
diff --git a/Mage.Sets/src/mage/sets/SeventhEdition.java b/Mage.Sets/src/mage/sets/SeventhEdition.java
index 98bfdc90f0..20dae0edcd 100644
--- a/Mage.Sets/src/mage/sets/SeventhEdition.java
+++ b/Mage.Sets/src/mage/sets/SeventhEdition.java
@@ -44,7 +44,7 @@ public class SeventhEdition extends ExpansionSet {
     }
 
     private SeventhEdition() {
-        super("Seventh Edition", "9ED", "", "mage.sets.seventhedition", new GregorianCalendar(2001, 3, 11).getTime(), Constants.SetType.CORE);
+        super("Seventh Edition", "7ED", "", "mage.sets.seventhedition", new GregorianCalendar(2001, 3, 11).getTime(), Constants.SetType.CORE);
         this.hasBoosters = true;
         this.numBoosterLands = 1;
         this.numBoosterCommon = 10;
diff --git a/Mage.Sets/src/mage/sets/SixthEdition.java b/Mage.Sets/src/mage/sets/SixthEdition.java
new file mode 100644
index 0000000000..4b21bd207e
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/SixthEdition.java
@@ -0,0 +1,55 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets;
+
+import java.util.GregorianCalendar;
+import mage.Constants;
+import mage.cards.ExpansionSet;
+
+/**
+ *
+ * @author North
+ */
+public class SixthEdition extends ExpansionSet {
+
+    private static final SixthEdition fINSTANCE = new SixthEdition();
+
+    public static SixthEdition getInstance() {
+        return fINSTANCE;
+    }
+
+    private SixthEdition() {
+        super("Sixth Edition", "6ED", "", "mage.sets.sixthedition", new GregorianCalendar(1999, 3, 28).getTime(), Constants.SetType.CORE);
+        this.hasBoosters = true;
+        this.numBoosterLands = 1;
+        this.numBoosterCommon = 10;
+        this.numBoosterUncommon = 3;
+        this.numBoosterRare = 1;
+        this.ratioBoosterMythic = 0;
+    }
+}
diff --git a/Utils/known-sets.txt b/Utils/known-sets.txt
index 1fe1e9c9d5..40a9ed1cbf 100644
--- a/Utils/known-sets.txt
+++ b/Utils/known-sets.txt
@@ -1,4 +1,5 @@
 Fifth Edition|fifthedition|
+Classic Sixth Edition|sixthedition|
 Seventh Edition|seventhedition|
 Eighth Edition|eighthedition|
 Ninth Edition|ninthedition|