diff --git a/mods/bucket/init.lua b/mods/bucket/init.lua
index 6715ebbf..56f8d541 100644
--- a/mods/bucket/init.lua
+++ b/mods/bucket/init.lua
@@ -75,7 +75,7 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name
 							"place "..source) then
 						return
 					end
-					minetest.add_node(pos, {name=source})
+					minetest.place_node(pos, {name=source})
 				end
 
 				-- Check if pointing to a buildable node
@@ -123,6 +123,7 @@ minetest.register_craftitem("bucket:bucket_empty", {
 				return
 			end
 
+			minetest.dig_node(pointed_thing.under)
 			minetest.add_node(pointed_thing.under, {name="air"})
 
 			return ItemStack(liquiddef.itemname)
diff --git a/mods/default/README.txt b/mods/default/README.txt
index 888aae46..8e371cf5 100644
--- a/mods/default/README.txt
+++ b/mods/default/README.txt
@@ -196,3 +196,11 @@ Gambit (WTFPL):
   default_coal.png
   default_grass_*.png
   default_paper.png
+
+Michel Baradari (CC BY 3.0):
+  default_water_footstep.1.ogg
+  default_water_footstep.2.ogg
+
+mikhog (CC BY 3.0):
+  default_lava_footstep.1.ogg
+  default_lava_footstep.2.ogg
diff --git a/mods/default/functions.lua b/mods/default/functions.lua
index 82c9282a..333d02f9 100644
--- a/mods/default/functions.lua
+++ b/mods/default/functions.lua
@@ -83,6 +83,34 @@ function default.node_sound_glass_defaults(table)
 	return table
 end
 
+function default.node_sound_water_defaults(table)
+	table = table or {}
+	table.footstep = table.footstep or
+			{name="default_water_footstep", gain=0.25}
+	table.dug = table.dug or
+			{name="default_water_footstep", gain=0.4}
+	table.dig = table.dig or
+			{name="default_water_footstep", gain=0.4}
+	table.place = table.place or
+			{name="default_water_footstep", gain=0.4}
+	default.node_sound_defaults(table)
+	return table
+end
+
+function default.node_sound_lava_defaults(table)
+	table = table or {}
+	table.footstep = table.footstep or
+			{name="default_lava_footstep", gain=0.25}
+	table.dug = table.dug or
+			{name="default_lava_footstep", gain=0.4}
+	table.dig = table.dig or
+			{name="default_lava_footstep", gain=0.4}
+	table.place = table.place or
+			{name="default_lava_footstep", gain=0.4}
+	default.node_sound_defaults(table)
+	return table
+end
+
 --
 -- Lavacooling
 --
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index 49e0524e..104ca020 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -901,6 +901,7 @@ minetest.register_node("default:water_source", {
 	liquid_viscosity = 1,
 	post_effect_color = {a=64, r=100, g=100, b=200},
 	groups = {water=3, liquid=3, puts_out_fire=1},
+	sounds = default.node_sound_water_defaults(),
 })
 
 minetest.register_node("default:water_flowing", {
@@ -945,6 +946,7 @@ minetest.register_node("default:water_flowing", {
 	liquid_viscosity = 1,
 	post_effect_color = {a=64, r=100, g=100, b=200},
 	groups = {water=3, liquid=3, puts_out_fire=1, not_in_creative_inventory=1},
+	sounds = default.node_sound_water_defaults(),
 })
 
 
@@ -993,6 +995,7 @@ minetest.register_node("default:lava_source", {
 	damage_per_second = 4 * 2,
 	post_effect_color = {a=192, r=255, g=64, b=0},
 	groups = {lava=3, liquid=2, hot=3, igniter=1},
+	sounds = default.node_sound_lava_defaults(),
 })
 
 minetest.register_node("default:lava_flowing", {
@@ -1039,6 +1042,7 @@ minetest.register_node("default:lava_flowing", {
 	damage_per_second = 4 * 2,
 	post_effect_color = {a=192, r=255, g=64, b=0},
 	groups = {lava=3, liquid=2, hot=3, igniter=1, not_in_creative_inventory=1},
+	sounds = default.node_sound_lava_defaults(),
 })
 
 --
diff --git a/mods/default/sounds/default_lava_footstep.1.ogg b/mods/default/sounds/default_lava_footstep.1.ogg
new file mode 100644
index 00000000..d70e08e4
Binary files /dev/null and b/mods/default/sounds/default_lava_footstep.1.ogg differ
diff --git a/mods/default/sounds/default_lava_footstep.2.ogg b/mods/default/sounds/default_lava_footstep.2.ogg
new file mode 100644
index 00000000..c4fcdf10
Binary files /dev/null and b/mods/default/sounds/default_lava_footstep.2.ogg differ
diff --git a/mods/default/sounds/default_water_footstep.1.ogg b/mods/default/sounds/default_water_footstep.1.ogg
new file mode 100644
index 00000000..6d8537fa
Binary files /dev/null and b/mods/default/sounds/default_water_footstep.1.ogg differ
diff --git a/mods/default/sounds/default_water_footstep.2.ogg b/mods/default/sounds/default_water_footstep.2.ogg
new file mode 100644
index 00000000..636d957e
Binary files /dev/null and b/mods/default/sounds/default_water_footstep.2.ogg differ