diff --git a/README.md b/README.md
index b0c199fb..e93c07b4 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 * mobiles/engine/
     * [mobs_redo][] ([MIT][lic.mobs_redo]) -- version: [7de8bc4 Git][ver.mobs_redo] *2017-05-12* ([patched][patch.mobs_redo])
 * mobiles/general/
-	* [mobs_animal][] ([MIT][lic.mobs_animal]) -- version: [ebc2e3a Git][ver.mobs_animal] *2017-05-27*
+	* [mobs_animal][] ([MIT][lic.mobs_animal]) -- version: [ebc2e3a Git][ver.mobs_animal] *2017-05-27* ([patched][patch.mobs_animal])
 * mobiles/passive/
 	* [mob_horse][] -- version: [39b6986 Git][ver.mob_horse] *2017-05-29* ([patched][patch.mob_horse])
     * [peaceful_npc][] ([WTFPL][lic.wtfpl]) -- version: [2b3a7a5 Git][ver.peaceful_npc] *2015-08-09*
@@ -530,6 +530,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 [patch.minetest]: https://github.com/AntumDeluge/mtgame-minetest/tree/914595e
 [patch.mob_horse]: https://github.com/AntumDeluge/mtmod-mob_horse/tree/4ce38fa
 [patch.mobf_core]: https://github.com/AntumDeluge/mtmp-mobf_core/tree/e6fa3b7
+[patch.mobs_animal]: https://github.com/AntumDeluge/mtmod-mobs_animal/tree/8b18341
 [patch.mobs_goblins]: https://github.com/AntumDeluge/mtmod-mobs_goblins/tree/2b40fab
 [patch.mobs_redo]: https://github.com/AntumDeluge/mtmod-mobs_redo/tree/a6613ec
 [patch.moreblocks]: https://github.com/AntumDeluge/mtmod-moreblocks/tree/b52a403
diff --git a/mods/mobiles/general/mobs_animal/init.lua b/mods/mobiles/general/mobs_animal/init.lua
index 1618780d..9066602b 100644
--- a/mods/mobiles/general/mobs_animal/init.lua
+++ b/mods/mobiles/general/mobs_animal/init.lua
@@ -10,17 +10,39 @@ else
 end
 mobs.intllib = S
 
+local function log(message)
+	if minetest.setting_getbool("log_mods") then
+		minetest.log("action", "[mobs_animal] " .. message)
+	end
+end
+
 -- Animals
 
-dofile(path .. "/chicken.lua") -- JKmurray
-dofile(path .. "/cow.lua") -- KrupnoPavel
-dofile(path .. "/rat.lua") -- PilzAdam
-dofile(path .. "/sheep.lua") -- PilzAdam
-dofile(path .. "/warthog.lua") -- KrupnoPavel
-dofile(path .. "/bee.lua") -- KrupnoPavel
-dofile(path .. "/bunny.lua") -- ExeterDad
-dofile(path .. "/kitten.lua") -- Jordach/BFD
-dofile(path .. "/penguin.lua") -- D00Med
+local animals = {
+	"chicken", -- JKmurray
+	"cow", -- KrupnoPavel
+	"rat", -- PilzAdam
+	"sheep", -- PilzAdam
+	"warthog", -- KrupnoPavel
+	"bee", -- KrupnoPavel
+	"bunny", -- ExeterDad
+	"kitten", -- Jordach/BFD
+	"penguin", -- D00Med
+}
+
+for index, animal in ipairs(animals) do
+	local enable_animal = minetest.setting_getbool("mobs.enable_" .. animal)
+	-- Default enabled
+	if enable_animal == nil then
+		enable_animal = true
+	end
+	if enable_animal then
+		log(animal .. " enabled")
+		dofile(path .. "/" .. animal .. ".lua")
+	else
+		log(animal .. " disabled")
+	end
+end
 
 dofile(path .. "/lucky_block.lua")
 
diff --git a/mods/mobiles/general/mobs_animal/settingtypes.txt b/mods/mobiles/general/mobs_animal/settingtypes.txt
new file mode 100644
index 00000000..59179246
--- /dev/null
+++ b/mods/mobiles/general/mobs_animal/settingtypes.txt
@@ -0,0 +1,26 @@
+# Enables chicken.
+mobs.enable_chicken (Enable chicken) bool true
+
+# Enables cow.
+mobs.enable_cow (Enable cow) bool true
+
+# Enables rat.
+mobs.enable_rat (Enable rat) bool true
+
+# Enables sheep.
+mobs.enable_sheep (Enable sheep) bool true
+
+# Enables warthog.
+mobs.enable_warthog (Enable warthog) bool true
+
+# Enables bee.
+mobs.enable_bee (Enable bee) bool true
+
+# Enables bunny.
+mobs.enable_bunny (Enable bunny) bool true
+
+# Enables kitten.
+mobs.enable_kitten (Enable kitten) bool true
+
+# Enables penguin.
+mobs.enable_penguin (Enable penguin) bool true
diff --git a/settingtypes.txt b/settingtypes.txt
index f740dda9..efb5e8b2 100644
--- a/settingtypes.txt
+++ b/settingtypes.txt
@@ -115,6 +115,37 @@ slingshot.require_rubber_band (Require rubber band in craft recipe) bool true
 
 [*Mobiles]
 
+
+[**mobs_animal]
+
+# Enables chicken.
+mobs.enable_chicken (Enable chicken) bool true
+
+# Enables cow.
+mobs.enable_cow (Enable cow) bool true
+
+# Enables rat.
+mobs.enable_rat (Enable rat) bool true
+
+# Enables sheep.
+mobs.enable_sheep (Enable sheep) bool true
+
+# Enables warthog.
+mobs.enable_warthog (Enable warthog) bool true
+
+# Enables bee.
+mobs.enable_bee (Enable bee) bool true
+
+# Enables bunny.
+mobs.enable_bunny (Enable bunny) bool true
+
+# Enables kitten.
+mobs.enable_kitten (Enable kitten) bool true
+
+# Enables penguin.
+mobs.enable_penguin (Enable penguin) bool true
+
+
 [**sneeker]
 
 # Logs debug output.