diff --git a/.gitattributes b/.gitattributes
index fc64df36bbb..0c35beaf4b5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -285,6 +285,7 @@ res/quest/decks/Wolverine[!!-~]3.dck -text
 res/quest/decks/Wyatt[!!-~]Earp[!!-~]1.dck -text
 res/quest/decks/Wyatt[!!-~]Earp[!!-~]2.dck -text
 res/quest/decks/Wyatt[!!-~]Earp[!!-~]3.dck -text
+res/quest/decks/quest[!!-~]22.dck -text
 res/quest/decks/quest1.dck -text
 res/quest/decks/quest10.dck -text
 res/quest/decks/quest11.dck -text
diff --git a/res/quest/decks/quest 22.dck b/res/quest/decks/quest 22.dck
new file mode 100644
index 00000000000..596f838552f
--- /dev/null
+++ b/res/quest/decks/quest 22.dck	
@@ -0,0 +1,14 @@
+quest 22
+[general]
+constructed
+[main]
+6 Swamp
+4 Underground Sea
+4 Jwar Isle Refuge
+4 Frost Marsh
+4 Watery Grave
+4 Fabricate
+1 Mystical Tutor
+4 Thrumming Stone
+29 Relentless Rats
+[sideboard]
diff --git a/res/quest/hard.txt b/res/quest/hard.txt
index 82b515015f9..3be08f12094 100644
--- a/res/quest/hard.txt
+++ b/res/quest/hard.txt
@@ -59,7 +59,6 @@ Neo 3
 Newton 3
 Pebbles Flintstone 3
 Picard 3
-Pied Piper of Hamelin 3
 Pinky and the Brain 3
 Professor X 3
 R2-D2 3
diff --git a/res/quest/quests.txt b/res/quest/quests.txt
index cdd01733ac6..b3410bfc60e 100644
--- a/res/quest/quests.txt
+++ b/res/quest/quests.txt
@@ -208,4 +208,14 @@ Six random rares
 500
 Private Domain.jpg
 
+22
+The Pied Piper
+A mysterious man threatens to flood the land with a relentless stream of hungry rats. Cross his plan before it's too late.
+Hard
+Not Repeatable
+40
+three random rares
+150
+Dungeon Crawling Black.jpg
+
 End
\ No newline at end of file
diff --git a/src/forge/Gui_Quest.java b/src/forge/Gui_Quest.java
index 8cf2d9b87f5..cd598ede1b2 100644
--- a/src/forge/Gui_Quest.java
+++ b/src/forge/Gui_Quest.java
@@ -563,8 +563,6 @@ public class Gui_Quest extends JFrame implements NewConstants{
         sb.append("\r\n");
         sb.append("Picard 3		hard	UWG Elf deck similar to Morpheus but also has flying elves");
         sb.append("\r\n");
-	sb.append("Pied Piper of Hamelin 3	hard	Thrumming Stone and Relentless Rats (nothing else)");
-        sb.append("\r\n");
         sb.append("Pinky and the Brain 3	hard	Royal Assassin, WoG + Damnation, Liliana Vess, Beacon of Unrest");
         sb.append("\r\n");
         sb.append("Professor X 3		hard	Master of Etherium + Vedalken Archmage and many artifacts");
diff --git a/src/forge/QuestUtil.java b/src/forge/QuestUtil.java
index d583159b9e7..bbb4475baad 100644
--- a/src/forge/QuestUtil.java
+++ b/src/forge/QuestUtil.java
@@ -758,6 +758,26 @@ public class QuestUtil {
 			
 			qa.setCardRewardList(pack.getRare(6));
 		}
+
+		else if (id == 22) // Pied Piper
+		{
+			CardList humanList = new CardList();
+			String humanSetupCards[] = {"Volunteer Militia", "Land Tax", "Elvish Farmer", "An-Havva Township"};
+			
+			for (int i = 0; i < 4; i ++)
+			{
+				Card c = AllZone.CardFactory.getCard(humanSetupCards[i], Constant.Player.Human);
+				humanList.add(c);
+			}
+			qa.setHuman(humanList);
+			
+			String compySetupCards[] = {"Darksteel Citadel", "Relentless Rats"};
+			
+			for (int i = 0; i < 2; i ++)
+				qa.addCompy(compySetupCards[i]);
+			
+			qa.setCardRewardList(pack.getRare(3));
+		}
 			
 	}