diff --git a/mods/ENTITIES/mobs_mc/0_gameconfig.lua b/mods/ENTITIES/mobs_mc/0_gameconfig.lua
index 6b1180b738..81229aa277 100644
--- a/mods/ENTITIES/mobs_mc/0_gameconfig.lua
+++ b/mods/ENTITIES/mobs_mc/0_gameconfig.lua
@@ -157,6 +157,7 @@ mobs_mc.follow = {
 	chicken = { "farming:seed_wheat", "farming:seed_cotton" }, -- seeds in general
 	parrot = { "farming:seed_wheat", "farming:seed_cotton" }, -- seeds in general
 	horse = { mobs_mc.items.apple, mobs_mc.items.sugar, mobs_mc.items.wheat, mobs_mc.items.hay_bale, mobs_mc.items.golden_apple, mobs_mc.items.golden_carrot },
+	llama = { mobs_mc.items.wheat, mobs_mc.items.hay_bale, },
 	pig = { mobs_mc.items.potato, mobs_mc.items.carrot, mobs_mc.items.carrot_on_a_stick,
 		mobs_mc.items.apple, -- Minetest Game extra
 	},
diff --git a/mods/ENTITIES/mobs_mc/llama.lua b/mods/ENTITIES/mobs_mc/llama.lua
index 92da233a5f..0795676135 100644
--- a/mods/ENTITIES/mobs_mc/llama.lua
+++ b/mods/ENTITIES/mobs_mc/llama.lua
@@ -53,7 +53,7 @@ mobs:register_mob("mobs_mc:llama", {
 		look_start = 78,
 		look_end = 108,
 	},
-	follow = mobs_mc.items.horse,
+	follow = mobs_mc.follow.llama,
 	view_range = 16,
 	do_custom = function(self, dtime)
 
diff --git a/mods/ENTITIES/mobs_mc_gameconfig/init.lua b/mods/ENTITIES/mobs_mc_gameconfig/init.lua
index 4fe025bb0d..ab86cd2a27 100644
--- a/mods/ENTITIES/mobs_mc_gameconfig/init.lua
+++ b/mods/ENTITIES/mobs_mc_gameconfig/init.lua
@@ -73,7 +73,7 @@ mobs_mc.override.items = {
 	wheat = "mcl_farming:wheat_item",
 	cookie = "mcl_farming:cookie",
 	potato = "mcl_farming:potato_item",
-	hay_bale = "mcl_farming:hay_bale",
+	hay_bale = "mcl_farming:hay_block",
 	prismarine_shard = "mcl_ocean:prismarine_shard",
 	prismarine_crystals = "mcl_ocean:prismarine_crystals",
 	apple = "mcl_core:apple",
@@ -136,6 +136,7 @@ mobs_mc.override.follow = {
 	sheep = { mobs_mc.override.items.wheat },
 	cow = { mobs_mc.override.items.wheat },
 	horse = { mobs_mc.override.items.apple, mobs_mc.override.items.sugar, mobs_mc.override.items.wheat, mobs_mc.override.items.hay_bale, mobs_mc.override.items.golden_apple, mobs_mc.override.items.golden_carrot },
+	llama = { mobs_mc.override.items.wheat, mobs_mc.override.items.hay_bale },
 	rabbit = { mobs_mc.override.items.dandelion, mobs_mc.override.items.carrot, mobs_mc.override.items.golden_carrot },
 }