diff --git a/.gitattributes b/.gitattributes
index 918c50099c0..f725daa236f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2925,6 +2925,7 @@ res/cardsfolder/righteous_charge.txt -text svneol=native#text/plain
 res/cardsfolder/righteous_fury.txt -text svneol=native#text/plain
 res/cardsfolder/righteous_war.txt -text svneol=native#text/plain
 res/cardsfolder/rimebound_dead.txt -text svneol=native#text/plain
+res/cardsfolder/ring_of_gix.txt -text svneol=native#text/plain
 res/cardsfolder/riot_spikes.txt -text svneol=native#text/plain
 res/cardsfolder/rip_clan_crasher.txt -text svneol=native#text/plain
 res/cardsfolder/riptide_crab.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/ring_of_gix.txt b/res/cardsfolder/ring_of_gix.txt
new file mode 100644
index 00000000000..cbc93c46605
--- /dev/null
+++ b/res/cardsfolder/ring_of_gix.txt
@@ -0,0 +1,9 @@
+Name:Ring of Gix
+ManaCost:3
+Types:Artifact
+Text:no text
+K:Echo:3
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/ring_of_gix.jpg
+End
diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index c515938b33b..6618cb3845d 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -9109,7 +9109,7 @@ public class CardFactory implements NewConstants {
         
     
         //*****************************START*******************************
-        else if(cardName.equals("Icy Manipulator")) {
+        else if(cardName.equals("Icy Manipulator") || cardName.equals("Ring of Gix")) {
            /* The Rules state that this can target a tapped card, but it won't do anything */
            
            final Ability_Tap ability = new Ability_Tap(card, "1") {