diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua
index c4f353a1..1d8fed6b 100644
--- a/mods/default/crafting.lua
+++ b/mods/default/crafting.lua
@@ -301,7 +301,7 @@ minetest.register_craft({
 minetest.register_craft({
 	type = "shapeless",
 	output = "default:bronze_ingot",
-	recipe = {"default:steel_ingot", "default:copper_ingot"},
+	recipe = {"default:tin_ingot", "default:copper_ingot"},
 })
 
 minetest.register_craft({
@@ -352,6 +352,22 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = 'default:tinblock',
+	recipe = {
+		{'default:tin_ingot', 'default:tin_ingot', 'default:tin_ingot'},
+		{'default:tin_ingot', 'default:tin_ingot', 'default:tin_ingot'},
+		{'default:tin_ingot', 'default:tin_ingot', 'default:tin_ingot'},
+	}
+})
+
+minetest.register_craft({
+	output = 'default:tin_ingot 9',
+	recipe = {
+		{'default:tinblock'},
+	}
+})
+
 minetest.register_craft({
 	output = 'default:bronzeblock',
 	recipe = {
@@ -593,6 +609,12 @@ minetest.register_craft({
 	recipe = "default:copper_lump",
 })
 
+minetest.register_craft({
+	type = "cooking",
+	output = "default:tin_ingot",
+	recipe = "default:tin_lump",
+})
+
 minetest.register_craft({
 	type = "cooking",
 	output = "default:gold_ingot",
diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua
index 2d3652e2..954de383 100644
--- a/mods/default/craftitems.lua
+++ b/mods/default/craftitems.lua
@@ -31,6 +31,11 @@ minetest.register_craftitem("default:copper_lump", {
 	inventory_image = "default_copper_lump.png",
 })
 
+minetest.register_craftitem("default:tin_lump", {
+	description = "Tin Lump",
+	inventory_image = "default_tin_lump.png",
+})
+
 minetest.register_craftitem("default:mese_crystal", {
 	description = "Mese Crystal",
 	inventory_image = "default_mese_crystal.png",
@@ -61,6 +66,11 @@ minetest.register_craftitem("default:copper_ingot", {
 	inventory_image = "default_copper_ingot.png",
 })
 
+minetest.register_craftitem("default:tin_ingot", {
+	description = "Tin Ingot",
+	inventory_image = "default_tin_ingot.png",
+})
+
 minetest.register_craftitem("default:bronze_ingot", {
 	description = "Bronze Ingot",
 	inventory_image = "default_bronze_ingot.png",
diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua
index 4907cf7b..9c967379 100644
--- a/mods/default/mapgen.lua
+++ b/mods/default/mapgen.lua
@@ -207,6 +207,29 @@ minetest.register_ore({
 	flags          = "absheight",
 })
 
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:stone_with_tin",
+	wherein        = "default:stone",
+	clust_scarcity = 10*10*10,
+	clust_num_ores = 2,
+	clust_size     = 3,
+	height_min     = -63,
+	height_max     = -16,
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "default:stone_with_tin",
+	wherein        = "default:stone",
+	clust_scarcity = 7*7*7,
+	clust_num_ores = 3,
+	clust_size     = 3,
+	height_min     = -31000,
+	height_max     = -64,
+	flags          = "absheight",
+})
+
 if minetest.setting_get("mg_name") == "indev" then
 	-- Floatlands and high mountains springs
 	minetest.register_ore({
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index 3611a0e2..7c9b25b8 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -47,6 +47,15 @@ minetest.register_node("default:stone_with_copper", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("default:stone_with_tin", {
+	description = "Tin Ore",
+	tiles = {"default_stone.png^default_mineral_tin.png"},
+	is_ground_content = true,
+	groups = {cracky=2},
+	drop = 'default:tin_lump',
+	sounds = default.node_sound_stone_defaults(),
+})
+
 minetest.register_node("default:stone_with_mese", {
 	description = "Mese Ore",
 	tiles = {"default_stone.png^default_mineral_mese.png"},
@@ -1120,6 +1129,14 @@ minetest.register_node("default:copperblock", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("default:tinblock", {
+	description = "Tin Block",
+	tiles = {"default_tin_block.png"},
+	is_ground_content = true,
+	groups = {cracky=1,level=2},
+	sounds = default.node_sound_stone_defaults(),
+})
+
 minetest.register_node("default:bronzeblock", {
 	description = "Bronze Block",
 	tiles = {"default_bronze_block.png"},
diff --git a/mods/default/textures/default_mineral_tin.png b/mods/default/textures/default_mineral_tin.png
new file mode 100644
index 00000000..7fd21a15
Binary files /dev/null and b/mods/default/textures/default_mineral_tin.png differ
diff --git a/mods/default/textures/default_tin_block.png b/mods/default/textures/default_tin_block.png
new file mode 100644
index 00000000..02b5a535
Binary files /dev/null and b/mods/default/textures/default_tin_block.png differ
diff --git a/mods/default/textures/default_tin_ingot.png b/mods/default/textures/default_tin_ingot.png
new file mode 100644
index 00000000..cde51061
Binary files /dev/null and b/mods/default/textures/default_tin_ingot.png differ
diff --git a/mods/default/textures/default_tin_lump.png b/mods/default/textures/default_tin_lump.png
new file mode 100644
index 00000000..54590fb5
Binary files /dev/null and b/mods/default/textures/default_tin_lump.png differ
diff --git a/mods/external_legacy/init.lua b/mods/external_legacy/init.lua
index c4d8bb06..9ae87470 100644
--- a/mods/external_legacy/init.lua
+++ b/mods/external_legacy/init.lua
@@ -9,6 +9,8 @@ minetest.register_alias("moreores:gold_ingot", "default:gold_ingot")
 minetest.register_alias("moreores:mineral_copper", "default:stone_with_copper")
 minetest.register_alias("moreores:copper_lump", "default:copper_lump")
 minetest.register_alias("moreores:copper_ingot", "default:copper_ingot")
+minetest.register_alias("moreores:tin_lump", "default:tin_lump")
+minetest.register_alias("moreores:tin_ingot", "default:tin_ingot")
 minetest.register_alias("moreores:copper_block", "default:copperblock")
 minetest.register_alias("moreores:bronze_ingot", "default:bronze_ingot")
 minetest.register_alias("moreores:bronze_block", "default:bronzeblock")