diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua
index c077ca944..1d62082c9 100644
--- a/mods/ENTITIES/mobs_mc/villager.lua
+++ b/mods/ENTITIES/mobs_mc/villager.lua
@@ -427,7 +427,7 @@ local professions = {
 				"mobs_mc_villager_weaponsmith.png",
 				"mobs_mc_villager_weaponsmith.png",
 			},
-		jobsite = "mcl_furnaces:furnace", --FIXME: grindstone
+		jobsite = "mcl_grindstone:grindstone",
 		trades = {
 			{
 			{ { "mcl_core:coal_lump", 15, 15 }, E1 },
diff --git a/mods/ITEMS/mcl_grindstone/init.lua b/mods/ITEMS/mcl_grindstone/init.lua
new file mode 100644
index 000000000..52c5b2e99
--- /dev/null
+++ b/mods/ITEMS/mcl_grindstone/init.lua
@@ -0,0 +1,39 @@
+local S = minetest.get_translator(minetest.get_current_modname())
+
+minetest.register_node("mcl_grindstone:grindstone", {
+    description = S("Grindstone"),
+	_tt_help = S("Used to disenchant/fix tools"),
+	_doc_items_longdesc = S("This is currently a decorative block which serves as the weapon smith's work station.  In minecraft this is used to disenchant/fix tools howerver this has not yet been implemented"),
+	tiles = {
+		"grindstone_top.png",
+		"grindstone_top.png",
+		"grindstone_side.png",
+		"grindstone_side.png",
+		"grindstone_front.png",
+		"grindstone_front.png"
+	},
+	drawtype = "nodebox",
+    paramtype2 = "facedir",
+	node_box = {
+		type = "fixed",
+        -- created with nodebox editor
+		fixed = {
+			{-0.25, -0.25, -0.375, 0.25, 0.5, 0.375}, 
+			{-0.375, -0.0625, -0.1875, -0.25, 0.3125, 0.1875},
+			{0.25, -0.0625, -0.1875, 0.375, 0.3125, 0.1875},
+			{0.25, -0.5, -0.125, 0.375, -0.0625, 0.125},
+			{-0.375, -0.5, -0.125, -0.25, -0.0625, 0.125},
+		}
+	},
+	groups = {pickaxey = 1, deco_block = 1},
+	_mcl_blast_resistance = 6,
+	_mcl_hardness = 2
+})
+
+minetest.register_craft({
+	output = "mcl_grindstone:grindstone",
+	recipe = {
+		{ "mcl_core:stick", "mcl_stairs:slab_stone_rough", "mcl_core:stick"},
+		{ "group:wood", "", "group:wood"},
+	}
+})
\ No newline at end of file
diff --git a/mods/ITEMS/mcl_grindstone/mod.conf b/mods/ITEMS/mcl_grindstone/mod.conf
new file mode 100644
index 000000000..154de013f
--- /dev/null
+++ b/mods/ITEMS/mcl_grindstone/mod.conf
@@ -0,0 +1,3 @@
+name = mcl_grindstone
+author = TheRandomLegoBrick
+description = Adds a cool looking block for the weaponsmiths jobsite
\ No newline at end of file
diff --git a/mods/ITEMS/mcl_grindstone/textures/grindstone_front.png b/mods/ITEMS/mcl_grindstone/textures/grindstone_front.png
new file mode 100644
index 000000000..ec72b0470
Binary files /dev/null and b/mods/ITEMS/mcl_grindstone/textures/grindstone_front.png differ
diff --git a/mods/ITEMS/mcl_grindstone/textures/grindstone_side.png b/mods/ITEMS/mcl_grindstone/textures/grindstone_side.png
new file mode 100644
index 000000000..ec28f3014
Binary files /dev/null and b/mods/ITEMS/mcl_grindstone/textures/grindstone_side.png differ
diff --git a/mods/ITEMS/mcl_grindstone/textures/grindstone_top.png b/mods/ITEMS/mcl_grindstone/textures/grindstone_top.png
new file mode 100644
index 000000000..1096deba6
Binary files /dev/null and b/mods/ITEMS/mcl_grindstone/textures/grindstone_top.png differ