diff --git a/Spigot-Server-Patches/0189-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0189-Configurable-Cartographer-Treasure-Maps.patch
new file mode 100644
index 0000000000..fa909e4935
--- /dev/null
+++ b/Spigot-Server-Patches/0189-Configurable-Cartographer-Treasure-Maps.patch
@@ -0,0 +1,46 @@
+From 038707bc4a005f8f2d465a48ea4144cd3d41b058 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Tue, 20 Dec 2016 15:26:27 -0500
+Subject: [PATCH] Configurable Cartographer Treasure Maps
+
+Allow configuring for cartographers to return the same map location
+
+Also allow turning off treasure maps all together as they can eat up Map ID's
+which are limited in quantity.
+
+diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+index 73bf74422..a655b3310 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
++++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+@@ -399,4 +399,14 @@ public class PaperWorldConfig {
+             Bukkit.getLogger().warning("Spawn Egg and Armor Stand NBT filtering disabled, this is a potential security risk");
+         }
+     }
++
++    public boolean enableTreasureMaps = true;
++    public boolean treasureMapsAlreadyDiscovered = false;
++    private void treasureMapsAlreadyDiscovered() {
++        enableTreasureMaps = getBoolean("enable-treasure-maps", true);
++        treasureMapsAlreadyDiscovered = getBoolean("treasure-maps-return-already-discovered", false);
++        if (treasureMapsAlreadyDiscovered) {
++            log("Treasure Maps will return already discovered locations");
++        }
++    }
+ }
+diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
+index 4a6b3da1b..35675d9a5 100644
+--- a/src/main/java/net/minecraft/server/EntityVillager.java
++++ b/src/main/java/net/minecraft/server/EntityVillager.java
+@@ -761,7 +761,8 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
+         public void a(IMerchant imerchant, MerchantRecipeList merchantrecipelist, Random random) {
+             int i = this.a.a(random);
+             World world = imerchant.t_();
+-            BlockPosition blockposition = world.a(this.b, imerchant.u_(), true);
++            if (!world.paperConfig.enableTreasureMaps) return; // Paper
++            BlockPosition blockposition = world.a(this.b, imerchant.u_(), !world.paperConfig.treasureMapsAlreadyDiscovered); // Paper - pass false to return first structure, regardless of if its been discovered. true returns only undiscovered.
+ 
+             if (blockposition != null) {
+                 ItemStack itemstack = ItemWorldMap.a(world, (double) blockposition.getX(), (double) blockposition.getZ(), (byte) 2, true, true);
+-- 
+2.11.0
+