diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua
index 363d66bf37..0d8a0cb88a 100644
--- a/mods/default/crafting.lua
+++ b/mods/default/crafting.lua
@@ -78,6 +78,50 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = 'default:granite_smooth 4',
+	recipe = {
+		{'default:granite', 'default:granite'},
+		{'default:granite', 'default:granite'}
+	},
+})
+
+minetest.register_craft({
+	output = 'default:andesite_smooth 4',
+	recipe = {
+		{'default:andesite', 'default:andesite'},
+		{'default:andesite', 'default:andesite'}
+	},
+})
+
+minetest.register_craft({
+	output = 'default:diorite_smooth 4',
+	recipe = {
+		{'default:diorite', 'default:diorite'},
+		{'default:diorite', 'default:diorite'}
+	},
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = 'default:granite',
+	recipe = {'default:diorite', 'default:quartz_crystal'},
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = 'default:andesite 2',
+	recipe = {'default:diorite', 'default:cobble'},
+})
+
+minetest.register_craft({
+	output = 'default:diorite 2',
+	recipe = {
+		{'default:cobble', 'default:quartz_crystal'},
+		{'default:quartz_crystal', 'default:cobble'},
+	}
+})
+
 minetest.register_craft({
 	output = 'default:stick 4',
 	recipe = {
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index bfdc552a22..3909254637 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -202,6 +202,57 @@ minetest.register_node("default:stonebrickmossy", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("default:granite", {
+	description = "Granite",
+	tiles = {"default_granite.png"},
+	is_ground_content = true,
+	stack_max = 64,
+	groups = {cracky=3, stone=1},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:granite_smooth", {
+	description = "Polished Granite",
+	tiles = {"default_granite_smooth.png"},
+	stack_max = 64,
+	groups = {cracky=3, stone=1},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:andesite", {
+	description = "Andesite",
+	tiles = {"default_andesite.png"},
+	is_ground_content = true,
+	stack_max = 64,
+	groups = {cracky=3, stone=1},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:andesite_smooth", {
+	description = "Polished Andesite",
+	tiles = {"default_andesite_smooth.png"},
+	stack_max = 64,
+	groups = {cracky=3, stone=1},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:diorite", {
+	description = "Diorite",
+	tiles = {"default_diorite.png"},
+	is_ground_content = true,
+	stack_max = 64,
+	groups = {cracky=3, stone=1},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:diorite_smooth", {
+	description = "Polished Diorite",
+	tiles = {"default_diorite_smooth.png"},
+	stack_max = 64,
+	groups = {cracky=3, stone=1},
+	sounds = default.node_sound_stone_defaults(),
+})
+
 minetest.register_node("default:dirt_with_grass", {
 	description = "Grass Block",
 	tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
diff --git a/mods/default/textures/default_andesite.png b/mods/default/textures/default_andesite.png
new file mode 100644
index 0000000000..01b8c118a8
Binary files /dev/null and b/mods/default/textures/default_andesite.png differ
diff --git a/mods/default/textures/default_andesite_smooth.png b/mods/default/textures/default_andesite_smooth.png
new file mode 100644
index 0000000000..7d592bdfee
Binary files /dev/null and b/mods/default/textures/default_andesite_smooth.png differ
diff --git a/mods/default/textures/default_diorite.png b/mods/default/textures/default_diorite.png
new file mode 100644
index 0000000000..3b4406f4eb
Binary files /dev/null and b/mods/default/textures/default_diorite.png differ
diff --git a/mods/default/textures/default_diorite_smooth.png b/mods/default/textures/default_diorite_smooth.png
new file mode 100644
index 0000000000..4adccb5438
Binary files /dev/null and b/mods/default/textures/default_diorite_smooth.png differ
diff --git a/mods/default/textures/default_granite.png b/mods/default/textures/default_granite.png
new file mode 100644
index 0000000000..861f83d237
Binary files /dev/null and b/mods/default/textures/default_granite.png differ
diff --git a/mods/default/textures/default_granite_smooth.png b/mods/default/textures/default_granite_smooth.png
new file mode 100644
index 0000000000..a7916eca22
Binary files /dev/null and b/mods/default/textures/default_granite_smooth.png differ