diff --git a/.gitattributes b/.gitattributes
index 403fcce6f53..449cdcebdc5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -345,6 +345,7 @@ res/cardsfolder/aphetto_exterminator.txt svneol=native#text/plain
 res/cardsfolder/aphetto_grifter.txt -text svneol=native#text/plain
 res/cardsfolder/aphetto_runecaster.txt -text svneol=native#text/plain
 res/cardsfolder/aphetto_vulture.txt -text svneol=native#text/plain
+res/cardsfolder/aphotic_wisps.txt -text svneol=native#text/plain
 res/cardsfolder/apocalypse.txt -text svneol=native#text/plain
 res/cardsfolder/apocalypse_hydra.txt -text svneol=native#text/plain
 res/cardsfolder/apostles_blessing.txt -text svneol=native#text/plain
@@ -1502,6 +1503,7 @@ res/cardsfolder/crimson_acolyte.txt -text svneol=native#text/plain
 res/cardsfolder/crimson_kobolds.txt -text svneol=native#text/plain
 res/cardsfolder/crimson_manticore.txt -text svneol=native#text/plain
 res/cardsfolder/crimson_roc.txt svneol=native#text/plain
+res/cardsfolder/crimson_wisps.txt -text svneol=native#text/plain
 res/cardsfolder/crippling_fatigue.txt -text svneol=native#text/plain
 res/cardsfolder/cromat.txt -text svneol=native#text/plain
 res/cardsfolder/crookclaw_elder.txt -text svneol=native#text/plain
@@ -4845,6 +4847,7 @@ res/cardsfolder/nirkana_revenant.txt -text svneol=native#text/plain
 res/cardsfolder/nissa_revane.txt -text svneol=native#text/plain
 res/cardsfolder/nissas_chosen.txt -text svneol=native#text/plain
 res/cardsfolder/niv_mizzet_the_firemind.txt -text svneol=native#text/plain
+res/cardsfolder/niveous_wisps.txt -text svneol=native#text/plain
 res/cardsfolder/no_dachi.txt -text svneol=native#text/plain
 res/cardsfolder/no_mercy.txt -text svneol=native#text/plain
 res/cardsfolder/nobilis_of_war.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/aphotic_wisps.txt b/res/cardsfolder/aphotic_wisps.txt
new file mode 100644
index 00000000000..593cb42d0d6
--- /dev/null
+++ b/res/cardsfolder/aphotic_wisps.txt
@@ -0,0 +1,10 @@
+Name:Aphotic Wisps
+ManaCost:B
+Types:Instant
+Text:no text
+A:SP$ Pump | Cost$ B | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Fear | SubAbility$ SVar=DBDraw | SpellDescription$ Target creature becomes black and gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.) Draw a card.
+SVar:DBDraw:DB$Draw | SubAbility$ SVar=DBColor | NumCards$ 1
+SVar:DBColor:DB$Animate | Colors$ Black | OverwriteColors$ True | Defined$ Targeted
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/aphotic_wisps.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/crimson_wisps.txt b/res/cardsfolder/crimson_wisps.txt
new file mode 100644
index 00000000000..37f74c262c2
--- /dev/null
+++ b/res/cardsfolder/crimson_wisps.txt
@@ -0,0 +1,10 @@
+Name:Crimson Wisps
+ManaCost:R
+Types:Instant
+Text:no text
+A:SP$ Pump | Cost$ R | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Haste | SubAbility$ SVar=DBDraw | SpellDescription$ Target creature becomes red and gains haste until end of turn. Draw a card.
+SVar:DBDraw:DB$Draw | SubAbility$ SVar=DBColor | NumCards$ 1
+SVar:DBColor:DB$Animate | Colors$ Red | OverwriteColors$ True | Defined$ Targeted
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/crimson_wisps.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/niveous_wisps.txt b/res/cardsfolder/niveous_wisps.txt
new file mode 100644
index 00000000000..f9f8f256051
--- /dev/null
+++ b/res/cardsfolder/niveous_wisps.txt
@@ -0,0 +1,11 @@
+Name:Niveous Wisps
+ManaCost:W
+Types:Instant
+Text:no text
+A:SP$ Animate | Cost$ W | ValidTgts$ Creature | TgtPrompt$ Select target creature | Colors$ White | OverwriteColors$ True | SubAbility$ SVar=DBDraw | SpellDescription$ Target creature becomes white until end of turn. Tap that creature. Draw a card.
+SVar:DBDraw:DB$Draw | SubAbility$ SVar=DBTap | NumCards$ 1
+SVar:DBTap:DB$Tap | Defined$ Targeted
+SVar:RemAIDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/niveous_wisps.jpg
+End
\ No newline at end of file
diff --git a/src/forge/card/abilityFactory/AbilityFactory_Pump.java b/src/forge/card/abilityFactory/AbilityFactory_Pump.java
index f34c856a3f3..e04bd1c1d7b 100644
--- a/src/forge/card/abilityFactory/AbilityFactory_Pump.java
+++ b/src/forge/card/abilityFactory/AbilityFactory_Pump.java
@@ -162,7 +162,7 @@ public class AbilityFactory_Pump {
     	
         final boolean kHaste = Keywords.contains("Haste");
         final boolean evasive = (Keywords.contains("Flying") || Keywords.contains("Horsemanship") || 
-        		Keywords.contains("HIDDEN Unblockable"));
+        		Keywords.contains("HIDDEN Unblockable") || Keywords.contains("Fear") || Keywords.contains("Intimidate"));
         final boolean kSize = !Keywords.get(0).equals("none");
         String KWpump[] = {"none"};
         if (!Keywords.get(0).equals("none"))