diff --git a/mods/default/init.lua b/mods/default/init.lua
index 1f2c4f7d..99f7cb82 100644
--- a/mods/default/init.lua
+++ b/mods/default/init.lua
@@ -509,6 +509,14 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = 'default:obsidian_glass',
+	recipe = {
+		{'', '', ''},
+		{'default:obsidian_shard', 'default:obsidian_shard', ''},
+		{'default:obsidian_shard', 'default:obsidian_shard', ''},
+	}
+})
 --
 -- Crafting (tool repair)
 --
@@ -527,6 +535,12 @@ minetest.register_craft({
 	recipe = "group:sand",
 })
 
+minetest.register_craft({
+	type = "cooking",
+	output = "default:obsidian_rock",
+	recipe = "default:obsidian_shard",
+})
+
 minetest.register_craft({
 	type = "cooking",
 	output = "default:stone",
@@ -1040,6 +1054,26 @@ minetest.register_node("default:cloud", {
 	groups = {not_in_creative_inventory=1},
 })
 
+minetest.register_node("default:obsidian_glass", {
+	description = "Obsidian Glass",
+	drawtype = "glasslike",
+	tiles = {"default_obsidian_glass.png"},
+	is_ground_content = true,
+	paramtype = "light",
+	sunlight_propagates = true,
+	sounds = default.node_sound_glass_defaults(),
+	groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
+	drop = "default:obsidian_shard",
+})
+
+minetest.register_node("default:obsidian_rock", {
+	description = "Obsidian Rock",
+	tiles = {"default_obsidian_rock.png"},
+	is_ground_content = true,
+	sounds = default.node_sound_glass_defaults(),
+	groups = {snappy=1,bendy=2,cracky=1,melty=2,level=2},
+})
+
 minetest.register_node("default:water_flowing", {
 	description = "Flowing Water",
 	inventory_image = minetest.inventorycube("default_water.png"),
@@ -1696,6 +1730,11 @@ minetest.register_craftitem("default:scorched_stuff", {
 	inventory_image = "default_scorched_stuff.png",
 })
 
+minetest.register_craftitem("default:obsidian_shard", {
+	description = "Obsidian Shard",
+	inventory_image = "default_obsidian_shard.png",
+})
+
 -- Support old code
 function default.spawn_falling_node(p, nodename)
 	spawn_falling_node(p, nodename)
@@ -1741,11 +1780,11 @@ minetest.register_on_punchnode(on_punchnode)
 --
 
 default.cool_lava_source = function(pos)
-	minetest.env:set_node(pos, {name="default:stone"})
+	minetest.env:set_node(pos, {name="default:obsidian_glass"})
 end
 
 default.cool_lava_flowing = function(pos)
-	minetest.env:set_node(pos, {name="default:cobble"})
+	minetest.env:set_node(pos, {name="default:stone"})
 end
 
 minetest.register_abm({
diff --git a/mods/default/textures/Thumbs.db b/mods/default/textures/Thumbs.db
new file mode 100644
index 00000000..fc1a241f
Binary files /dev/null and b/mods/default/textures/Thumbs.db differ
diff --git a/mods/default/textures/default_obsidian_glass.png b/mods/default/textures/default_obsidian_glass.png
new file mode 100644
index 00000000..7e96168f
Binary files /dev/null and b/mods/default/textures/default_obsidian_glass.png differ
diff --git a/mods/default/textures/default_obsidian_rock.png b/mods/default/textures/default_obsidian_rock.png
new file mode 100644
index 00000000..60a04569
Binary files /dev/null and b/mods/default/textures/default_obsidian_rock.png differ
diff --git a/mods/default/textures/default_obsidian_shard.png b/mods/default/textures/default_obsidian_shard.png
new file mode 100644
index 00000000..a9b7d541
Binary files /dev/null and b/mods/default/textures/default_obsidian_shard.png differ