diff --git a/mods/farming/README.txt b/mods/farming/README.txt
index 198f7c0..1f643af 100644
--- a/mods/farming/README.txt
+++ b/mods/farming/README.txt
@@ -48,3 +48,7 @@ Gambit (WTFPL):
   farming_flour.png
   farming_cotton_seed.png
   farming_wheat_seed.png
+
+LNJ (CC BY-SA 3.0):
+  farming_potato.png
+  farming_potato_*.png
diff --git a/mods/farming/init.lua b/mods/farming/init.lua
index 45370e7..0fd8d08 100644
--- a/mods/farming/init.lua
+++ b/mods/farming/init.lua
@@ -1,4 +1,3 @@
--- Global farming namespace
 farming = {}
 farming.path = minetest.get_modpath("farming")
 
@@ -6,73 +5,5 @@ farming.path = minetest.get_modpath("farming")
 dofile(farming.path .. "/api.lua")
 dofile(farming.path .. "/nodes.lua")
 dofile(farming.path .. "/hoes.lua")
-
--- WHEAT
-farming.register_plant("farming:wheat", {
-	description = "Wheat seed",
-	inventory_image = "farming_wheat_seed.png",
-	steps = 8,
-	minlight = 13,
-	maxlight = default.LIGHT_MAX,
-	fertility = {"grassland"}
-})
-minetest.register_craftitem("farming:flour", {
-	description = "Flour",
-	inventory_image = "farming_flour.png",
-})
-
-minetest.register_craftitem("farming:bread", {
-	description = "Bread",
-	inventory_image = "farming_bread.png",
-	on_use = minetest.item_eat(5),
-})
-
-minetest.register_craft({
-	type = "shapeless",
-	output = "farming:flour",
-	recipe = {"farming:wheat", "farming:wheat", "farming:wheat", "farming:wheat"}
-})
-
-minetest.register_craft({
-	type = "cooking",
-	cooktime = 15,
-	output = "farming:bread",
-	recipe = "farming:flour"
-})
-
--- Cotton
-farming.register_plant("farming:cotton", {
-	description = "Cotton seed",
-	inventory_image = "farming_cotton_seed.png",
-	steps = 8,
-	minlight = 13,
-	maxlight = default.LIGHT_MAX,
-	fertility = {"grassland", "desert"}
-})
-
-minetest.register_alias("farming:string", "farming:cotton")
-
-minetest.register_craft({
-	output = "wool:white",
-	recipe = {
-		{"farming:cotton", "farming:cotton"},
-		{"farming:cotton", "farming:cotton"},
-	}
-})
-
--- Straw
-minetest.register_craft({
-	output = "farming:straw 3",
-	recipe = {
-		{"farming:wheat", "farming:wheat", "farming:wheat"},
-		{"farming:wheat", "farming:wheat", "farming:wheat"},
-		{"farming:wheat", "farming:wheat", "farming:wheat"},
-	}
-})
-
-minetest.register_craft({
-	output = "farming:wheat 3",
-	recipe = {
-		{"farming:straw"},
-	}
-})
+dofile(farming.path .. "/plants.lua")
+dofile(farming.path .. "/misc.lua")
diff --git a/mods/farming/misc.lua b/mods/farming/misc.lua
new file mode 100644
index 0000000..9dbf226
--- /dev/null
+++ b/mods/farming/misc.lua
@@ -0,0 +1,55 @@
+minetest.register_craftitem("farming:flour", {
+	description = "Flour",
+	inventory_image = "farming_flour.png",
+})
+
+minetest.register_craftitem("farming:bread", {
+	description = "Bread",
+	inventory_image = "farming_bread.png",
+	on_use = minetest.item_eat(5),
+})
+
+minetest.register_alias("farming:string", "farming:cotton")
+
+
+-- Crafting recipes
+
+-- Bread
+minetest.register_craft({
+	type = "shapeless",
+	output = "farming:flour",
+	recipe = {"farming:wheat", "farming:wheat", "farming:wheat", "farming:wheat"}
+})
+
+minetest.register_craft({
+	type = "cooking",
+	cooktime = 15,
+	output = "farming:bread",
+	recipe = "farming:flour"
+})
+
+-- Wool
+minetest.register_craft({
+	output = "wool:white",
+	recipe = {
+		{"farming:cotton", "farming:cotton"},
+		{"farming:cotton", "farming:cotton"},
+	}
+})
+
+-- Straw
+minetest.register_craft({
+	output = "farming:straw 3",
+	recipe = {
+		{"farming:wheat", "farming:wheat", "farming:wheat"},
+		{"farming:wheat", "farming:wheat", "farming:wheat"},
+		{"farming:wheat", "farming:wheat", "farming:wheat"},
+	}
+})
+
+minetest.register_craft({
+	output = "farming:wheat 3",
+	recipe = {
+		{"farming:straw"},
+	}
+})
diff --git a/mods/farming/plants.lua b/mods/farming/plants.lua
new file mode 100644
index 0000000..fe0f7a1
--- /dev/null
+++ b/mods/farming/plants.lua
@@ -0,0 +1,31 @@
+-- Wheat
+farming.register_plant("farming:wheat", {
+	description = "Wheat seed",
+	inventory_image = "farming_wheat_seed.png",
+	steps = 8,
+	minlight = 13,
+	maxlight = default.LIGHT_MAX,
+	fertility = {"grassland"}
+})
+
+-- Cotton
+farming.register_plant("farming:cotton", {
+	description = "Cotton seed",
+	inventory_image = "farming_cotton_seed.png",
+	steps = 8,
+	minlight = 13,
+	maxlight = default.LIGHT_MAX,
+	fertility = {"grassland", "desert"}
+})
+
+-- Potato
+farming.register_plant("farming:potato", {
+	description = "Potato",
+	inventory_image = "farming_potato.png",
+	steps = 3,
+	has_seed = false,
+	minlight = 13,
+	maxlight = default.LIGHT_MAX,
+	fertility = {"grassland"},
+  on_use = minetest.item_eat(1)
+})
diff --git a/mods/farming/textures/farming_potato.png b/mods/farming/textures/farming_potato.png
new file mode 100644
index 0000000..361c7e3
Binary files /dev/null and b/mods/farming/textures/farming_potato.png differ
diff --git a/mods/farming/textures/farming_potato_1.png b/mods/farming/textures/farming_potato_1.png
new file mode 100644
index 0000000..75a3cdf
Binary files /dev/null and b/mods/farming/textures/farming_potato_1.png differ
diff --git a/mods/farming/textures/farming_potato_2.png b/mods/farming/textures/farming_potato_2.png
new file mode 100644
index 0000000..8b7ccd4
Binary files /dev/null and b/mods/farming/textures/farming_potato_2.png differ
diff --git a/mods/farming/textures/farming_potato_3.png b/mods/farming/textures/farming_potato_3.png
new file mode 100644
index 0000000..cc29ef3
Binary files /dev/null and b/mods/farming/textures/farming_potato_3.png differ