diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties
index 531727d7f..a9f4c4526 100644
--- a/core/src/main/assets/messages/actors/actors.properties
+++ b/core/src/main/assets/messages/actors/actors.properties
@@ -960,6 +960,9 @@ actors.mobs.npcs.blacksmith.intro_quest_crystal=Careful though, the mine's dange
 actors.mobs.npcs.blacksmith.intro_quest_gnoll=Careful though, the mine's dangerous for a little human like you. Some gnolls want the gold too and now they're wreckin' the place. They're stupid things, so their mining has caused all sorts of collapses and cave-ins. You'll have to mine though it, so _look for recently disturbed rock._\n\nI think one of the gnolls is causing most of the trouble, probably a _geomancer shaman_ or somethin'. I'll pay extra, if you can find and kill it, but I'm sure it'll fight back.
 actors.mobs.npcs.blacksmith.intro_quest_fungi=Careful though, the mine's dangerous for a little human like you. There's some sorta fungus monster that's been growing down there. It's got mushroom sentries that're really deadly if they see you, but they can't get up and chase you at least. _Keep out of sight_ if you want to stay alive.\n\nI'll pay extra if you can manage to take down the _biggest mushrom,_ but it'll take some real effort. It's connected to a bunch of mycelium nodes that're hidden in the walls. You'll have to break most of 'em before you can really damage it.
 actors.mobs.npcs.blacksmith.reminder=You done wastin' my time? The mine entrance is over there.
+actors.mobs.npcs.blacksmith.reminder_crystal=Bring me as much gold as you can, and try to break the big crystal too.
+actors.mobs.npcs.blacksmith.reminder_gnoll=Bring me as much gold as you can, and try to kill the gnoll geomancer too.
+actors.mobs.npcs.blacksmith.reminder_fungi=Bring me as much gold as you can, and try to kill the giant mushroom too.
 actors.mobs.npcs.blacksmith.lost_pick=Are you kiddin' me? Where is my pickaxe?!
 actors.mobs.npcs.blacksmith.quest_start_prompt=You ready to go down? Make sure you've got some free space for the gold.\n\n_I'm only lettin' you down der once!_
 actors.mobs.npcs.blacksmith.enter_yes=I'm Ready
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java
index 03773d58c..c61b1ff9e 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Blacksmith.java
@@ -190,7 +190,13 @@ public class Blacksmith extends NPC {
 				}
 			} else {
 
-				tell(Messages.get(this, "reminder"));
+				String msg = Messages.get(this, "reminder") + "\n\n";
+				switch (Quest.type){
+					case Quest.CRYSTAL: msg += Messages.get(Blacksmith.this, "reminder_crystal"); break;
+					case Quest.GNOLL:   msg += Messages.get(Blacksmith.this, "reminder_gnoll"); break;
+					case Quest.FUNGI:   msg += Messages.get(Blacksmith.this, "reminder_fungi"); break;
+				}
+				tell(msg);
 
 			}
 		} else if (Quest.type == Quest.OLD && Quest.reforges == 0) {
@@ -400,6 +406,7 @@ public class Blacksmith extends NPC {
 				if (type == FUNGI){
 					type = GNOLL;
 				}
+				//type = FUNGI;
 				
 				given = false;
 				generateRewards( true );