diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua
index eb150044..5e850cac 100644
--- a/mods/default/crafting.lua
+++ b/mods/default/crafting.lua
@@ -605,6 +605,31 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = "default:quartz",
+	recipe = {
+		{"default:quartz_shard","default:quartz_shard","default:quartz_shard"},
+		{"default:quartz_shard","default:quartz_shard","default:quartz_shard"},
+		{"default:quartz_shard","default:quartz_shard","default:quartz_shard"}
+	},
+})
+
+minetest.register_craft({
+	output = "default:pillar_quartz 2",
+	recipe = {
+		{"default:quartz"},
+		{"default:quartz"}
+	},
+})
+
+minetest.register_craft({
+	output = "default:chiseled_quartz",
+	recipe = {
+		{"stairs:slab_quartz"},
+		{"stairs:slab_quartz"}
+	},
+})
+
 --
 -- Crafting (tool repair)
 --
diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua
index 026a31c0..839c6b0c 100644
--- a/mods/default/craftitems.lua
+++ b/mods/default/craftitems.lua
@@ -85,3 +85,8 @@ minetest.register_craftitem("default:obsidian_shard", {
 	description = "Obsidian Shard",
 	inventory_image = "default_obsidian_shard.png",
 })
+
+minetest.register_craftitem("default:quartz_shard", {
+	description = "Quartz Shard",
+	inventory_image = "default_quartz_shard.png",
+})
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index 354096e0..55c2e58a 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -1478,3 +1478,40 @@ minetest.register_node("default:snowblock", {
 		dug = {name="default_snow_footstep", gain=0.75},
 	}),
 })
+
+minetest.register_node("default:quartz", {
+	description = "Quartz Block",
+	tiles = {"default_quartz_block.png"},
+	is_ground_content = true,
+	groups = {cracky=1,level=2},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:pillar_quartz", {
+	description = "Pillar Quartz Block",
+	tiles = {"default_pillar_quartz_block_top.png","default_pillar_quartz_block_top.png","default_pillar_quartz_block_side.png"},
+	paramtype2 = "facedir",
+	is_ground_content = true,
+	groups = {cracky=1,level=2},
+	sounds = default.node_sound_stone_defaults(),
+	on_place = minetest.rotate_node,
+})
+
+minetest.register_node("default:chiseled_quartz", {
+	description = "Chiseled Quartz Block",
+	tiles = {"default_chiseled_quartz_block_top.png","default_chiseled_quartz_block_top.png","default_chiseled_quartz_block_side.png"},
+	paramtype2 = "facedir",
+	is_ground_content = true,
+	groups = {cracky=1,level=2},
+	sounds = default.node_sound_stone_defaults(),
+	on_place = minetest.rotate_node,
+})
+
+minetest.register_node("default:stone_with_quartz", {
+	description = "Quartz Ore",
+	tiles = {"default_stone.png^default_mineral_quartz.png"},
+	is_ground_content = true,
+	groups = {cracky=1},
+	drop = "default:quartz_shard",
+	sounds = default.node_sound_stone_defaults(),
+})
diff --git a/mods/stairs/init.lua b/mods/stairs/init.lua
index afd89bda..9b3acc9d 100644
--- a/mods/stairs/init.lua
+++ b/mods/stairs/init.lua
@@ -288,3 +288,10 @@ stairs.register_stair_and_slab("stonebrick", "default:stonebrick",
 		"Stone Brick Stair",
 		"Stone Brick Slab",
 		default.node_sound_stone_defaults())
+
+stairs.register_stair_and_slab("quartz", "default:quartz",
+		{cracky=3},
+		{"default_quartz_block.png"},
+		"Quartz Stair",
+		"Quartz Slab",
+		default.node_sound_stone_defaults())