diff --git a/mods/default/README.txt b/mods/default/README.txt
index 19c3971..7a19082 100644
--- a/mods/default/README.txt
+++ b/mods/default/README.txt
@@ -197,6 +197,7 @@ Gambit (WTFPL):
   default_sign_wall_steel.png
   default_sign_wood.png
   default_sign_steel.png
+  default_flint.png
 
 asl97 (WTFPL):
   default_ice.png
diff --git a/mods/default/lua/items/materials.lua b/mods/default/lua/items/materials.lua
index d7e2c49..ef512eb 100644
--- a/mods/default/lua/items/materials.lua
+++ b/mods/default/lua/items/materials.lua
@@ -1,3 +1,8 @@
+default.register_craftitem("default:flint", {
+	description = "Flint",
+	inventory_image = "default_flint.png"
+})
+
 -- Mese
 
 default.register_craftitem("default:mese_crystal", {
diff --git a/mods/default/lua/nodes/gravel.lua b/mods/default/lua/nodes/gravel.lua
index b6f4a0d..fbf7559 100644
--- a/mods/default/lua/nodes/gravel.lua
+++ b/mods/default/lua/nodes/gravel.lua
@@ -6,4 +6,11 @@ default.register_node("default:gravel", {
 		footstep = {name = "default_gravel_footstep", gain = 0.5},
 		dug = {name = "default_gravel_footstep", gain = 1.0},
 	}),
+	drop = {
+		max_items = 1,
+		items = {
+			{items = {"default:flint"}, rarity = 16},
+			{items = {"default:gravel"}}
+		}
+	}
 })
diff --git a/mods/default/textures/default_flint.png b/mods/default/textures/default_flint.png
new file mode 100644
index 0000000..4a6c434
Binary files /dev/null and b/mods/default/textures/default_flint.png differ
diff --git a/mods/fire/README.txt b/mods/fire/README.txt
index 77cad6a..e9f4863 100644
--- a/mods/fire/README.txt
+++ b/mods/fire/README.txt
@@ -4,6 +4,7 @@ This mod is part of Minetest TNG
 License of source code:
 -----------------------
 Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2016 LNJ <lnj.git@gmail.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -34,3 +35,6 @@ Muadtralk (CC BY-SA 3.0):
  
 celeron55 (CC BY-SA 3.0):
   fire_basic_flame.png
+
+Gambit (WTFPL):
+  fire_flint_steel.png
diff --git a/mods/fire/init.lua b/mods/fire/init.lua
index f3f6369..abba243 100644
--- a/mods/fire/init.lua
+++ b/mods/fire/init.lua
@@ -36,6 +36,34 @@ minetest.register_node("fire:basic_flame", {
 	on_blast = function() end, -- unaffected by explosions
 })
 
+minetest.register_tool("fire:flint_and_steel", {
+	description = "Flint and Steel",
+	inventory_image = "fire_flint_steel.png",
+	on_use = function(itemstack, user, pointed_thing)
+		local player_name = user:get_player_name()
+		local pt = pointed_thing
+
+		if pt.type == "node" and minetest.get_node(pt.above).name == "air" then
+			if not minetest.is_protected(pt.above, player_name) then
+				minetest.set_node(pt.above, {name="fire:basic_flame"})
+			else
+				minetest.chat_send_player(player_name, "This area is protected")
+			end
+		end
+		
+		if not minetest.setting_getbool("creative_mode") then
+			itemstack:add_wear(1000)
+			return itemstack
+		end
+	end
+})
+
+minetest.register_craft({
+	output = "fire:flint_and_steel",
+	recipe = {
+		{"default:flint", "default:steel_ingot"}
+	}
+})
 
 -- Get sound area of position
 
diff --git a/mods/fire/textures/fire_flint_steel.png b/mods/fire/textures/fire_flint_steel.png
new file mode 100644
index 0000000..ffa8a40
Binary files /dev/null and b/mods/fire/textures/fire_flint_steel.png differ