diff --git a/mods/ENTITIES/extra_mobs/cod.lua b/mods/ENTITIES/extra_mobs/cod.lua
index fd0a40621..b9c5bf5e3 100644
--- a/mods/ENTITIES/extra_mobs/cod.lua
+++ b/mods/ENTITIES/extra_mobs/cod.lua
@@ -95,7 +95,14 @@ local cod = {
   				self.object:set_rotation({x=0,y=(atan(vec.z / vec.x) + 3 * pi / 2) - self.rotate,z=0})
   			end
   		end
-    end
+	end,
+	on_rightclick = function(self, clicker)
+		if clicker:get_wielded_item():get_name() == "mcl_buckets:bucket_water" then
+			self.object:remove()
+			clicker:set_wielded_item("mcl_fishing:bucket_cod")
+			awards.unlock(clicker:get_player_name(), "mcl:tacticalFishing")
+		end
+	end
 }
 
 mobs:register_mob("extra_mobs:cod", cod)
diff --git a/mods/ENTITIES/extra_mobs/salmon.lua b/mods/ENTITIES/extra_mobs/salmon.lua
index ba3503b60..fba81e4db 100644
--- a/mods/ENTITIES/extra_mobs/salmon.lua
+++ b/mods/ENTITIES/extra_mobs/salmon.lua
@@ -55,6 +55,13 @@ local salmon = {
     view_range = 16,
     runaway = true,
     fear_height = 4,
+	on_rightclick = function(self, clicker)
+		if clicker:get_wielded_item():get_name() == "mcl_buckets:bucket_water" then
+			 self.object:remove()
+			 clicker:set_wielded_item("mcl_fishing:bucket_salmon")
+			 awards.unlock(clicker:get_player_name(), "mcl:tacticalFishing")
+		end
+	end
 }
 
 mobs:register_mob("extra_mobs:salmon", salmon)
diff --git a/mods/ENTITIES/extra_mobs/textures/cod_bucket.png b/mods/ENTITIES/extra_mobs/textures/cod_bucket1.png
similarity index 100%
rename from mods/ENTITIES/extra_mobs/textures/cod_bucket.png
rename to mods/ENTITIES/extra_mobs/textures/cod_bucket1.png
diff --git a/mods/HUD/mcl_achievements/init.lua b/mods/HUD/mcl_achievements/init.lua
index 7b3b2fc1c..761888d16 100644
--- a/mods/HUD/mcl_achievements/init.lua
+++ b/mods/HUD/mcl_achievements/init.lua
@@ -253,6 +253,13 @@ awards.register_achievement("mcl:fishyBusiness", {
 	icon = "mcl_armor_inv_chestplate_netherite.png",
 })]]--
 
+-- Triggered in extra_mobs
+awards.register_achievement("mcl:tacticalFishing", {
+	title = S("Tactical Fishing"),
+	description = S("Catch a fish... without a fishing rod!"),
+	icon = "pufferfish_bucket.png",
+})
+
 -- NON-PC ACHIEVEMENTS (XBox, Pocket Edition, etc.)
 
 if non_pc_achievements then
diff --git a/mods/ITEMS/mcl_fishing/init.lua b/mods/ITEMS/mcl_fishing/init.lua
index 2c2ba6982..39919dbd3 100644
--- a/mods/ITEMS/mcl_fishing/init.lua
+++ b/mods/ITEMS/mcl_fishing/init.lua
@@ -512,3 +512,25 @@ minetest.register_on_item_eat(function (hp_change, replace_with_item, itemstack,
 	end
 
 end )
+
+-- Fish Buckets
+fish_names = {"cod", "salmon"}
+
+for _, fish in ipairs(fish_names) do
+	mcl_buckets.register_liquid({
+		bucketname = "mcl_fishing:bucket_" .. fish,
+		source_place = function(pos)
+			minetest.add_entity(pos, "extra_mobs:" .. fish)
+			return "mcl_core:water_source"
+		end,
+		source_take = {"extra_mobs:" .. fish},
+		inventory_image = fish .. "_bucket.png",
+		name = S("Bucket of " .. fish),
+		longdesc = S("This bucket is filled with water and " .. fish .. "."),
+		usagehelp = S("Place it to empty the bucket and place a " .. fish .. ". Obtain by right clicking on a " .. fish .. " fish with a bucket of water."),
+		tt_help = S("Places a water source and " .. fish .. "."),
+		extra_check = function(pos, placer)
+			return true, true
+		end,
+	})
+end
diff --git a/mods/ITEMS/mcl_fishing/textures/cod_bucket.png b/mods/ITEMS/mcl_fishing/textures/cod_bucket.png
new file mode 100644
index 000000000..582207cb0
Binary files /dev/null and b/mods/ITEMS/mcl_fishing/textures/cod_bucket.png differ
diff --git a/mods/ITEMS/mcl_fishing/textures/pufferfish_bucket.png b/mods/ITEMS/mcl_fishing/textures/pufferfish_bucket.png
new file mode 100644
index 000000000..2c88bac35
Binary files /dev/null and b/mods/ITEMS/mcl_fishing/textures/pufferfish_bucket.png differ
diff --git a/mods/ITEMS/mcl_fishing/textures/salmon_bucket.png b/mods/ITEMS/mcl_fishing/textures/salmon_bucket.png
new file mode 100644
index 000000000..b9ac22fd9
Binary files /dev/null and b/mods/ITEMS/mcl_fishing/textures/salmon_bucket.png differ
diff --git a/mods/ITEMS/mcl_fishing/textures/tropical_fish_bucket.png b/mods/ITEMS/mcl_fishing/textures/tropical_fish_bucket.png
new file mode 100644
index 000000000..edf7dd244
Binary files /dev/null and b/mods/ITEMS/mcl_fishing/textures/tropical_fish_bucket.png differ