diff --git a/res/cardsfolder/vampire_nocturnus.txt b/res/cardsfolder/vampire_nocturnus.txt
index e7fd5aced0c..a25a9d2f206 100644
--- a/res/cardsfolder/vampire_nocturnus.txt
+++ b/res/cardsfolder/vampire_nocturnus.txt
@@ -1,9 +1,11 @@
 Name:Vampire Nocturnus
 ManaCost:1 B B B
 Types:Creature Vampire
-Text:As long as the top card of your library is black, Vampire Nocturnus and other Vampire creatures you control get +2/+1 and have flying.
+Text:no text
 PT:3/3
 K:Play with the top card of your library revealed.
+K:stPumpSelf:Permanent:2/1/Flying:TopCardOfLibraryIsBlack:As long as the top card of your library is black, CARDNAME and other Vampire creatures you control get +2/+1 and have flying.
+K:stPumpAll:Creature.Vampire+Other+YouCtrl:2/1/Flying:TopCardOfLibraryIsBlack:no text
 SVar:PlayMain1:TRUE
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vampire_nocturnus.jpg
diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java
index 3a6f915421c..faa184c5f6b 100644
--- a/src/forge/GameActionUtil.java
+++ b/src/forge/GameActionUtil.java
@@ -12470,6 +12470,10 @@ public class GameActionUtil {
 	      		CardList oppHand = AllZoneUtil.getPlayerHand(SourceCard.getController().getOpponent());
 	      		if(!(oppHand.size() == 0)) return false;
 	      	}
+  	      	if(SpecialConditions.contains("TopCardOfLibraryIsBlack")) {
+	      		PlayerZone lib = AllZone.getZone(Constant.Zone.Library, SourceCard.getController());
+	      		if(!(lib.get(0).isBlack())) return false;
+	      	}
   	      	if(SpecialConditions.contains("LibraryLE")) {
   	      		CardList Library = new CardList();
   	      		Library.addAll(AllZone.getZone(Constant.Zone.Library, SourceCard.getController()).getCards());
@@ -13642,48 +13646,6 @@ public class GameActionUtil {
 		}
 	};
 	
-	public static Command Vampire_Nocturnus                       = new Command() {
-
-		private static final long serialVersionUID = 666334034902503917L;
-		CardList                  gloriousAnthemList = new CardList();
-
-		public void execute() {
-			CardList list = gloriousAnthemList;
-			Card c;
-			// reset all cards in list - aka "old" cards
-			for(int i = 0; i < list.size(); i++) {
-				c = list.get(i);
-				c.addSemiPermanentAttackBoost(-2);
-				c.addSemiPermanentDefenseBoost(-1);
-				c.removeExtrinsicKeyword("Flying");
-			}
-
-			// add +1/+1 to cards
-			list.clear();
-			PlayerZone[] zone = getZone("Vampire Nocturnus");
-
-			// for each zone found add +1/+1 to each card
-			for(int outer = 0; outer < zone.length; outer++) {
-				CardList creature = new CardList(
-						zone[outer].getCards());
-				creature = creature.getType("Vampire");
-
-				for(int i = 0; i < creature.size(); i++) {
-					c = creature.get(i);
-					if (CardFactoryUtil.getTopCard(c) != null)
-					{
-						if((CardFactoryUtil.getTopCard(c)).isBlack()) {
-							c.addSemiPermanentAttackBoost(2);
-							c.addSemiPermanentDefenseBoost(1);
-							c.addExtrinsicKeyword("Flying");
-							gloriousAnthemList.add(c);
-						}
-					}//topCard!=null
-				}// for inner
-			}// for outer
-		}// execute()
-	}; // Vampire Nocturnus
-	
 	/*
 	public static Command Dauntless_Dourbark          = new Command() {
 
@@ -16113,7 +16075,6 @@ public class GameActionUtil {
 		
 		commands.put("Umbra_Stalker", Umbra_Stalker);
 		
-		commands.put("Vampire_Nocturnus", Vampire_Nocturnus);
 		commands.put("Vexing_Beetle", Vexing_Beetle);
 		
 		commands.put("Windwright_Mage", Windwright_Mage);
diff --git a/src/forge/StaticEffects.java b/src/forge/StaticEffects.java
index d6bfc69f2de..04c11e844a6 100644
--- a/src/forge/StaticEffects.java
+++ b/src/forge/StaticEffects.java
@@ -123,7 +123,6 @@ public class StaticEffects
 		
 		cardToEffectsList.put("Umbra Stalker", new String[] {"Umbra_Stalker"});
 		
-		cardToEffectsList.put("Vampire Nocturnus", new String[]{"Vampire_Nocturnus"});
 		cardToEffectsList.put("Vexing Beetle", new String[] {"Vexing_Beetle"});
 		
 		cardToEffectsList.put("Windwright Mage", new String[] {"Windwright_Mage"});