diff --git a/chat.lua b/chat.lua
index 6ce1a7e..bcf860e 100644
--- a/chat.lua
+++ b/chat.lua
@@ -27,7 +27,7 @@ minetest.register_chatcommand("setspawn", {
 	func = function(name, param)
 		local player = minetest.get_player_by_name(name)
 		local pos = player:getpos()
-		fun_caves.db.spawn[name] = pos
+		beds.spawn[name] = pos
 		minetest.chat_send_player(name, 'Your spawn position has been changed.')
 	end,
 })
diff --git a/depends.txt b/depends.txt
index 13bc334..7e4fe1b 100644
--- a/depends.txt
+++ b/depends.txt
@@ -2,6 +2,7 @@ default
 flowers
 wool
 bucket
+beds
 hunger?
 mobs?
 mobs_monster?
diff --git a/init.lua b/init.lua
index 2d2131f..9772575 100644
--- a/init.lua
+++ b/init.lua
@@ -115,15 +115,6 @@ end
 --fun_caves.print_recipes()
 
 
-minetest.register_on_respawnplayer(function(player)
-	local name = player:get_player_name()
-	if fun_caves.db.spawn[name] then
-		player:setpos(fun_caves.db.spawn[name])
-		return true
-	end
-end)
-
-
 local hunger_mod = minetest.get_modpath("hunger")
 fun_caves.hunger_id = {}