diff --git a/mods/ENTITIES/mobs_mc/LICENSE-media.md b/mods/ENTITIES/mobs_mc/LICENSE-media.md
index 6a8457bb62..b3a72847fe 100644
--- a/mods/ENTITIES/mobs_mc/LICENSE-media.md
+++ b/mods/ENTITIES/mobs_mc/LICENSE-media.md
@@ -107,7 +107,7 @@ Origin of those models:
 * TenPlus1, from `mobs_monster` or `mobs_animal` mod (MIT License)
     * `mobs_chicken.ogg`
     * `mobs_fireball.ogg`
-    * `mobs_kitten.ogg`
+    * `mobs_mc_cat_idle.1.ogg`
     * `mobs_mc_llama.ogg`
     * `mobs_pig.ogg`
     * `mobs_pig_angry.ogg`
@@ -158,5 +158,14 @@ Origin of those models:
 * [suonho](https://freesound.org/people/suonho/)
     * `mobs_mc_bat_idle.ogg` (CC BY 3.0)
         * Source: <https://freesound.org/people/suonho/sounds/59344/>
+* [cmusounddesign](https://freesound.org/people/cmusounddesign/)
+    * `mobs_mc_cat_hiss.ogg` (CC BY 3.0)
+        * Source: <https://freesound.org/people/cmusounddesign/sounds/71899/>
+* [SelsRoyalNavy](https://freesound.org/people/SelsRoyalNavy/)
+    * `mobs_mc_cat_idle.2.ogg` (CC0)
+        * Source: <https://freesound.org/people/SelsRoyalNavy/sounds/427081/>
+* [ebcrosby](https://freesound.org/people/ebcrosby/)
+    * `mobs_mc_ocelot_hurt.ogg` (CC BY 3.0)
+        * Source: <https://freesound.org/people/ebcrosby/sounds/332979/>
 
 Note: Many of these sounds have been more or less modified to fit the game.
diff --git a/mods/ENTITIES/mobs_mc/ocelot.lua b/mods/ENTITIES/mobs_mc/ocelot.lua
index e6c385cf13..174611271a 100644
--- a/mods/ENTITIES/mobs_mc/ocelot.lua
+++ b/mods/ENTITIES/mobs_mc/ocelot.lua
@@ -50,15 +50,19 @@ local ocelot = {
 	fall_damage = 0,
 	fear_height = 4,
 	sounds = {
-		random = "mobs_kitten",
-		-- TODO: more sounds
+		damage = "mobs_mc_ocelot_hurt",
+		death = "mobs_mc_ocelot_hurt",
 		distance = 16,
 	},
 	animation = {
-		speed_normal = 25,		speed_run = 50,
-		stand_start = 0,		stand_end = 0,
-		walk_start = 0,		walk_end = 40,
-		run_start = 0,		run_end = 40,
+		speed_normal = 25,
+		speed_run = 50,
+		stand_start = 0,
+		stand_end = 0,
+		walk_start = 0,
+		walk_end = 40,
+		run_start = 0,
+		run_end = 40,
 	},
 	follow = mobs_mc.follow.ocelot,
 	view_range = 12,
@@ -107,6 +111,12 @@ cat.tamed = true
 cat.runaway = false
 -- Automatically teleport cat to owner
 cat.do_custom = mobs_mc.make_owner_teleport_function(12)
+cat.sounds = {
+	random = "mobs_mc_cat_idle",
+	damage = "mobs_mc_cat_hiss",
+	death = "mobs_mc_ocelot_hurt",
+	distance = 16,
+}
 cat.on_rightclick = function(self, clicker)
 	if mobs:feed_tame(self, clicker, 1, true, false) then return end
 	if mobs:capture_mob(self, clicker, 0, 60, 5, false, nil) then return end
diff --git a/mods/ENTITIES/mobs_mc/sounds/mobs_kitten.ogg b/mods/ENTITIES/mobs_mc/sounds/mobs_kitten.ogg
deleted file mode 100644
index c2cdec59dc..0000000000
Binary files a/mods/ENTITIES/mobs_mc/sounds/mobs_kitten.ogg and /dev/null differ
diff --git a/mods/ENTITIES/mobs_mc/sounds/mobs_mc_cat_hiss.ogg b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_cat_hiss.ogg
new file mode 100644
index 0000000000..a51db0fe9d
Binary files /dev/null and b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_cat_hiss.ogg differ
diff --git a/mods/ENTITIES/mobs_mc/sounds/mobs_mc_cat_idle.1.ogg b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_cat_idle.1.ogg
new file mode 100644
index 0000000000..48e9977ed8
Binary files /dev/null and b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_cat_idle.1.ogg differ
diff --git a/mods/ENTITIES/mobs_mc/sounds/mobs_mc_cat_idle.2.ogg b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_cat_idle.2.ogg
new file mode 100644
index 0000000000..7e73248334
Binary files /dev/null and b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_cat_idle.2.ogg differ
diff --git a/mods/ENTITIES/mobs_mc/sounds/mobs_mc_ocelot_hurt.ogg b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_ocelot_hurt.ogg
new file mode 100644
index 0000000000..d2c6d97aaa
Binary files /dev/null and b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_ocelot_hurt.ogg differ