diff --git a/GROUPS.md b/GROUPS.md
index 04ec7e33ca..722d8ddc57 100644
--- a/GROUPS.md
+++ b/GROUPS.md
@@ -102,6 +102,7 @@ Please read <http://minecraft.gamepedia.com/Breaking> to learn how digging times
 * `water_bucket=1`: Bucket containing a liquid of group “water”
 * `enchantability=X`: How good the enchantments are the item gets (1 equals book)
 * `enchanted=1`: The item is already enchanted, meaning that it can't be enchanted using an enchanting table
+* `cobble=1`: Cobblestone of any kind
 
 ### Material groups
 
diff --git a/mods/ITEMS/mcl_brewing/init.lua b/mods/ITEMS/mcl_brewing/init.lua
index 38f81fa363..2ff2a806f0 100644
--- a/mods/ITEMS/mcl_brewing/init.lua
+++ b/mods/ITEMS/mcl_brewing/init.lua
@@ -959,7 +959,7 @@ minetest.register_craft({
 	output = "mcl_brewing:stand_000",
 	recipe = {
 		{ "", "mcl_mobitems:blaze_rod", "" },
-		{ "mcl_core:cobble", "mcl_core:cobble", "mcl_core:cobble" },
+		{ "group:cobble", "group:cobble", "group:cobble" },
 	}
 })
 
diff --git a/mods/ITEMS/mcl_core/nodes_base.lua b/mods/ITEMS/mcl_core/nodes_base.lua
index 2827cf8407..67dc8ea44d 100644
--- a/mods/ITEMS/mcl_core/nodes_base.lua
+++ b/mods/ITEMS/mcl_core/nodes_base.lua
@@ -724,7 +724,7 @@ minetest.register_node("mcl_core:cobble", {
 	tiles = {"default_cobble.png"},
 	is_ground_content = false,
 	stack_max = 64,
-	groups = {pickaxey=1, building_block=1, material_stone=1},
+	groups = {pickaxey=1, building_block=1, material_stone=1, cobble=1},
 	sounds = mcl_sounds.node_sound_stone_defaults(),
 	_mcl_blast_resistance = 6,
 	_mcl_hardness = 2,
diff --git a/mods/ITEMS/mcl_farming/hoes.lua b/mods/ITEMS/mcl_farming/hoes.lua
index 28ad938f48..d94ea6f8e6 100644
--- a/mods/ITEMS/mcl_farming/hoes.lua
+++ b/mods/ITEMS/mcl_farming/hoes.lua
@@ -119,7 +119,7 @@ minetest.register_tool("mcl_farming:hoe_stone", {
 		damage_groups = { fleshy = 1, },
 		punch_attack_uses = uses.stone,
 	},
-	_repair_material = "mcl_core:cobble",
+	_repair_material = "group:cobble",
 	_mcl_toollike_wield = true,
 	_mcl_diggroups = {
 		hoey = { speed = 4, level = 3, uses = 132 }
@@ -129,7 +129,7 @@ minetest.register_tool("mcl_farming:hoe_stone", {
 minetest.register_craft({
 	output = "mcl_farming:hoe_stone",
 	recipe = {
-		{"mcl_core:cobble", "mcl_core:cobble"},
+		{"group:cobble", "group:cobble"},
 		{"", "mcl_core:stick"},
 		{"", "mcl_core:stick"}
 	}
@@ -137,7 +137,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "mcl_farming:hoe_stone",
 	recipe = {
-		{"mcl_core:cobble", "mcl_core:cobble"},
+		{"group:cobble", "group:cobble"},
 		{"mcl_core:stick", ""},
 		{"mcl_core:stick", ""}
 	}
diff --git a/mods/ITEMS/mcl_furnaces/init.lua b/mods/ITEMS/mcl_furnaces/init.lua
index 9f836d1611..59cfe78588 100644
--- a/mods/ITEMS/mcl_furnaces/init.lua
+++ b/mods/ITEMS/mcl_furnaces/init.lua
@@ -574,9 +574,9 @@ minetest.register_node("mcl_furnaces:furnace_active", {
 minetest.register_craft({
 	output = "mcl_furnaces:furnace",
 	recipe = {
-		{ "mcl_core:cobble", "mcl_core:cobble", "mcl_core:cobble" },
-		{ "mcl_core:cobble", "", "mcl_core:cobble" },
-		{ "mcl_core:cobble", "mcl_core:cobble", "mcl_core:cobble" },
+		{ "group:cobble", "group:cobble", "group:cobble" },
+		{ "group:cobble", "", "group:cobble" },
+		{ "group:cobble", "group:cobble", "group:cobble" },
 	}
 })
 
diff --git a/mods/ITEMS/mcl_tools/crafting.lua b/mods/ITEMS/mcl_tools/crafting.lua
index 636cb66602..07032b184b 100644
--- a/mods/ITEMS/mcl_tools/crafting.lua
+++ b/mods/ITEMS/mcl_tools/crafting.lua
@@ -10,7 +10,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "mcl_tools:pick_stone",
 	recipe = {
-		{"mcl_core:cobble", "mcl_core:cobble", "mcl_core:cobble"},
+		{"group:cobble", "group:cobble", "group:cobble"},
 		{"", "mcl_core:stick", ""},
 		{"", "mcl_core:stick", ""},
 	}
@@ -55,7 +55,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "mcl_tools:shovel_stone",
 	recipe = {
-		{"mcl_core:cobble"},
+		{"group:cobble"},
 		{"mcl_core:stick"},
 		{"mcl_core:stick"},
 	}
@@ -108,16 +108,16 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "mcl_tools:axe_stone",
 	recipe = {
-		{"mcl_core:cobble", "mcl_core:cobble"},
-		{"mcl_core:cobble", "mcl_core:stick"},
+		{"group:cobble", "group:cobble"},
+		{"group:cobble", "mcl_core:stick"},
 		{"", "mcl_core:stick"},
 	}
 })
 minetest.register_craft({
 	output = "mcl_tools:axe_stone",
 	recipe = {
-		{"mcl_core:cobble", "mcl_core:cobble"},
-		{"mcl_core:stick", "mcl_core:cobble"},
+		{"group:cobble", "group:cobble"},
+		{"mcl_core:stick", "group:cobble"},
 		{"mcl_core:stick", ""},
 	}
 })
@@ -185,8 +185,8 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "mcl_tools:sword_stone",
 	recipe = {
-		{"mcl_core:cobble"},
-		{"mcl_core:cobble"},
+		{"group:cobble"},
+		{"group:cobble"},
 		{"mcl_core:stick"},
 	}
 })
diff --git a/mods/ITEMS/mcl_tools/init.lua b/mods/ITEMS/mcl_tools/init.lua
index 48515dc3cf..cbee8e3d0f 100644
--- a/mods/ITEMS/mcl_tools/init.lua
+++ b/mods/ITEMS/mcl_tools/init.lua
@@ -110,7 +110,7 @@ minetest.register_tool("mcl_tools:pick_stone", {
 		punch_attack_uses = 66,
 	},
 	sound = { breaks = "default_tool_breaks" },
-	_repair_material = "mcl_core:cobble",
+	_repair_material = "group:cobble",
 	_mcl_toollike_wield = true,
 	_mcl_diggroups = {
 		pickaxey = { speed = 4, level = 3, uses = 132 }
@@ -283,7 +283,7 @@ minetest.register_tool("mcl_tools:shovel_stone", {
 	},
 	on_place = make_grass_path,
 	sound = { breaks = "default_tool_breaks" },
-	_repair_material = "mcl_core:cobble",
+	_repair_material = "group:cobble",
 	_mcl_toollike_wield = true,
 	_mcl_diggroups = {
 		shovely = { speed = 4, level = 3, uses = 132 }
@@ -417,7 +417,7 @@ minetest.register_tool("mcl_tools:axe_stone", {
 	},
 	on_place = make_stripped_trunk,
 	sound = { breaks = "default_tool_breaks" },
-	_repair_material = "mcl_core:cobble",
+	_repair_material = "group:cobble",
 	_mcl_toollike_wield = true,
 	_mcl_diggroups = {
 		axey = { speed = 4, level = 3, uses = 132 }
@@ -520,7 +520,7 @@ minetest.register_tool("mcl_tools:sword_stone", {
 		punch_attack_uses = 132,
 	},
 	sound = { breaks = "default_tool_breaks" },
-	_repair_material = "mcl_core:cobble",
+	_repair_material = "group:cobble",
 	_mcl_toollike_wield = true,
 	_mcl_diggroups = {
 		swordy = { speed = 4, level = 3, uses = 132 },