diff --git a/border.lua b/border.lua
index 26e8d7b5b10439d9c01f02c41f4153af70a50864..62fcce9c22746de7ef703908dce8c959a3877323 100644
--- a/border.lua
+++ b/border.lua
@@ -30,7 +30,7 @@ minetest.register_node("mapserver:border", {
 		"mapserver_border.png"
 	},
 	groups = {cracky=3,oddly_breakable_by_hand=3},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = moditems.sound_glass(),
 	can_dig = mapserver.can_interact,
 	after_place_node = mapserver.after_place_node,
 
diff --git a/init.lua b/init.lua
index 13c1efe89595170b35a7f417eb89683bf0b1fef1..160e0356e8bc36833128e39538c39d9dba3ff3f7 100644
--- a/init.lua
+++ b/init.lua
@@ -1,4 +1,15 @@
 
+local default_path = core.get_modpath("default") and default
+local mineclone_path = core.get_modpath("mcl_core") and mcl_core
+
+moditems = {}
+
+if mineclone_path then
+	moditems.sound_glass = mcl_sounds.node_sound_glass_defaults
+else
+	moditems.sound_glass = default.node_sound_glass_defaults
+end
+
 mapserver = {
 	enable_crafting = minetest.settings:get("mapserver.enable_crafting") == "true",
 	send_interval = tonumber(minetest.settings:get("mapserver.send_interval")) or 2,
diff --git a/label.lua b/label.lua
index 6f1e62e098f1c76b467140f57ca2b218ba137da5..d96b82dc6f05533006279a3f0534cd63a470eb1d 100644
--- a/label.lua
+++ b/label.lua
@@ -32,7 +32,7 @@ minetest.register_node("mapserver:label", {
 		"mapserver_label.png"
 	},
 	groups = {cracky=3,oddly_breakable_by_hand=3},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = moditems.sound_glass(),
 	can_dig = mapserver.can_interact,
 	after_place_node = mapserver.after_place_node,
 
diff --git a/mod.conf b/mod.conf
index aff3949dc9e937cd255bf6957e19e94a7b6c8178..daf3a36475381382bb3b52c7a108ce01621b1716 100644
--- a/mod.conf
+++ b/mod.conf
@@ -1,3 +1,3 @@
 name = mapserver
 description = Mod for the mapserver.
-optional_depends = default, dye, advtrains, minecart, monitoring, bones
+optional_depends = default, dye, advtrains, minecart, monitoring, bones, mcl_core, mcl_sounds
diff --git a/poi.lua b/poi.lua
index 2d5103ad565ff650ffaef6bbd573fad1d8a76fb4..253d221842f72d6ea4e339188575678e6cf6447a 100644
--- a/poi.lua
+++ b/poi.lua
@@ -47,7 +47,7 @@ local register_poi = function(color, dye)
 			"[combine:16x16:0,0=mapserver_gold_block.png:3,2=mapserver_poi_" .. color .. ".png"
 		},
 		groups = {cracky=3,oddly_breakable_by_hand=3},
-		sounds = default.node_sound_glass_defaults(),
+		sounds = moditems.sound_glass(),
 		can_dig = mapserver.can_interact,
 		after_place_node = mapserver.after_place_node,
 
diff --git a/train.lua b/train.lua
index 16c81e5d5e4b2e7cb87b7a61c74285fe6fc75db3..33a3c72e5f06254775c31acf64437437f400e23d 100644
--- a/train.lua
+++ b/train.lua
@@ -33,7 +33,7 @@ minetest.register_node("mapserver:train", {
 		"mapserver_train.png"
 	},
 	groups = {cracky=3,oddly_breakable_by_hand=3},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = moditems.sound_glass(),
 	can_dig = mapserver.can_interact,
 	after_place_node = mapserver.after_place_node,