diff --git a/food/fish.arc b/food/fish.arc
index 0f1362a0c..5a459f99c 100644
--- a/food/fish.arc
+++ b/food/fish.arc
@@ -15,8 +15,8 @@ name_pl fishes
 client_type 601
 harvestable 1
 harvest_race fish
-harvest_exp 100
-harvest_level 1
+harvest_exp 40000
+harvest_level 20
 harvest_tool pole
 end
 
@@ -37,8 +37,8 @@ name_pl fishes
 client_type 601
 harvestable 1
 harvest_race fish
-harvest_exp 100
-harvest_level 1
+harvest_exp 40000
+harvest_level 20
 harvest_tool pole
 end
 
@@ -63,8 +63,8 @@ name_pl fishes
 client_type 601
 harvestable 1
 harvest_race fish
-harvest_exp 100
-harvest_level 1
+harvest_exp 4000
+harvest_level 10
 harvest_tool pole
 end
 
@@ -83,8 +83,8 @@ name_pl fishes
 client_type 601
 harvestable 1
 harvest_race fish
-harvest_exp 100
-harvest_level 1
+harvest_exp 800
+harvest_level 5
 harvest_tool pole
 end
 
@@ -103,8 +103,8 @@ name_pl fishes
 client_type 601
 harvestable 1
 harvest_race fish
-harvest_exp 100
-harvest_level 1
+harvest_exp 4000
+harvest_level 10
 harvest_tool pole
 end
 
@@ -123,7 +123,7 @@ name_pl fishes
 client_type 601
 harvestable 1
 harvest_race fish
-harvest_exp 100
-harvest_level 1
+harvest_exp 4000
+harvest_level 10
 harvest_tool pole
 end
diff --git a/food/fish.trs b/food/fish.trs
index a2016d494..1848fa9de 100644
--- a/food/fish.trs
+++ b/food/fish.trs
@@ -1,19 +1,34 @@
-treasure fish
+# Keep 'chance' low so that only a small fraction of all fishable tiles have
+# fish, but increase 'nrof' so that multiple fish can be caught once a
+# fishing tile has been found.
+treasure freshwater_fish
+ arch fishfood
+  chance 10
+  nrof 6
+  more
+ arch fish_4
+  chance 10
+  nrof 4
+end
+treasure sea_fish
+ arch fish_3
+  chance 7
+  nrof 3
+ more
+ arch fish_5
+  chance 7
+  nrof 3
+ more
+ arch fish_6
+  chance 7
+  nrof 3
+end
+treasure deepsea_fish
  arch fish_1
   chance 10
+  nrof 2
  more
  arch fish_2
   chance 10
- more
- arch fish_3
-  chance 10
- more
- arch fish_4
-  chance 10
- more
- arch fish_5
-  chance 10
- more
- arch fish_6
-  chance 10
+  nrof 2
 end
diff --git a/food/fishfood.arc b/food/fishfood.arc
index ed6049366..22dfd46e3 100644
--- a/food/fishfood.arc
+++ b/food/fishfood.arc
@@ -1,5 +1,5 @@
 Object fishfood
-name cooked fish
+name fish
 face fishfood.111
 food 200
 nrof 1
@@ -8,10 +8,10 @@ material 32
 value 12
 weight 3500
 identified 1
-name_pl cooked fish
+name_pl fish
 client_type 601
 harvest_race fish
-harvest_exp 100
+harvest_exp 400
 harvest_level 1
 harvest_tool pole
 end
diff --git a/ground/Lake/blake.arc b/ground/Lake/blake.arc
index bbdd2b6bc..7dd3b4375 100644
--- a/ground/Lake/blake.arc
+++ b/ground/Lake/blake.arc
@@ -5,6 +5,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_0.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_n
 face blake_1.111
@@ -13,6 +14,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_1.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_e
 face blake_2.111
@@ -21,6 +23,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_2.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_ne
 face blake_3.111
@@ -29,6 +32,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_3.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_s
 face blake_4.111
@@ -37,6 +41,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_4.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_sn
 face blake_5.111
@@ -45,6 +50,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_5.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_se
 face blake_6.111
@@ -53,6 +59,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_6.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_nes
 face blake_7.111
@@ -61,6 +68,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_7.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_w
 face blake_8.111
@@ -69,6 +77,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_8.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_nw
 face blake_9.111
@@ -77,6 +86,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_9.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_ew
 face blake_A.111
@@ -85,6 +95,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_A.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_new
 face blake_B.111
@@ -93,6 +104,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_B.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_sw
 face blake_C.111
@@ -101,6 +113,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_C.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_nse
 face blake_D.111
@@ -109,6 +122,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_D.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_sew
 face blake_E.111
@@ -117,6 +131,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_E.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_center
 face blake_F.111
@@ -126,4 +141,5 @@ is_water 1
 is_floor 1
 smoothlevel 255
 smoothface blake_F.111 empty_S.111
+randomitems freshwater_fish
 end
diff --git a/ground/Lake/lake.arc b/ground/Lake/lake.arc
index 7c22e0bfe..a48d0e8cc 100644
--- a/ground/Lake/lake.arc
+++ b/ground/Lake/lake.arc
@@ -5,6 +5,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_0.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_3_3
 face blake_1.111
@@ -13,6 +14,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_1.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_3_4
 face blake_2.111
@@ -21,6 +23,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_2.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_2_2_3
 face blake_3.111
@@ -29,6 +32,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_3.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_3_1
 face blake_4.111
@@ -37,6 +41,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_4.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_2_1_2
 face blake_5.111
@@ -45,6 +50,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_5.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_2_2_4
 face blake_6.111
@@ -53,6 +59,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_6.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_1_3
 face blake_7.111
@@ -61,6 +68,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_7.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_3_2
 face blake_8.111
@@ -69,6 +77,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_8.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_2_2_2
 face blake_9.111
@@ -77,6 +86,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_9.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_2_1_1
 face blake_A.111
@@ -85,6 +95,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_A.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_1_1
 face blake_B.111
@@ -93,6 +104,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_B.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_2_2_1
 face blake_C.111
@@ -101,6 +113,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_C.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_1_4
 face blake_D.111
@@ -109,6 +122,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_D.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_1_2
 face blake_E.111
@@ -117,6 +131,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface blake_E.111 empty_S.111
+randomitems freshwater_fish
 end
 Object biglake_4
 face blake_F.111
@@ -126,4 +141,5 @@ is_water 1
 is_floor 1
 smoothlevel 255
 smoothface blake_F.111 empty_S.111
+randomitems freshwater_fish
 end
diff --git a/ground/cyangrasspond.arc b/ground/cyangrasspond.arc
index 6a889b4a9..13a554951 100644
--- a/ground/cyangrasspond.arc
+++ b/ground/cyangrasspond.arc
@@ -9,4 +9,5 @@ is_water 1
 is_floor 1
 smoothlevel 45
 smoothface cyangrasspond.111 cyangrass_S.111
+randomitems freshwater_fish
 end
diff --git a/ground/deep_sea.arc b/ground/deep_sea.arc
index 7f6123d59..2ad5c7d59 100644
--- a/ground/deep_sea.arc
+++ b/ground/deep_sea.arc
@@ -13,4 +13,5 @@ no_pick 1
 is_water 1
 is_floor 1
 move_block all -boat
+randomitems deepsea_fish
 end
diff --git a/ground/sea.arc b/ground/sea.arc
index 8679912f0..ab0df9801 100644
--- a/ground/sea.arc
+++ b/ground/sea.arc
@@ -12,6 +12,7 @@ is_floor 1
 smoothlevel 20
 client_anim_sync 1
 anim_speed 5
+randomitems sea_fish
 end
 Object sea1
 name sea
@@ -27,6 +28,7 @@ is_floor 1
 smoothlevel 20
 client_anim_sync 1
 anim_speed 5
+randomitems sea_fish
 end
 Object sea_route
 name sea
@@ -43,6 +45,7 @@ is_floor 1
 smoothlevel 20
 client_anim_sync 1
 anim_speed 5
+randomitems sea_fish
 end
 Object sea_nw
 name sea
@@ -52,6 +55,7 @@ move_block all
 no_pick 1
 is_water 1
 smoothlevel 20
+randomitems sea_fish
 end
 Object sea_ne
 name sea
@@ -61,6 +65,7 @@ move_block all
 no_pick 1
 is_water 1
 smoothlevel 20
+randomitems sea_fish
 end
 Object sea_sw
 name sea
@@ -70,6 +75,7 @@ move_block all
 no_pick 1
 is_water 1
 smoothlevel 20
+randomitems sea_fish
 end
 Object sea_se
 name sea
@@ -79,6 +85,7 @@ no_pick 1
 move_block all
 is_water 1
 smoothlevel 20
+randomitems sea_fish
 end
 Object sea_nes
 name sea
@@ -88,6 +95,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface sea_7.111 empty_S.111
+randomitems sea_fish
 end
 Object sea_new
 name sea
@@ -97,6 +105,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface sea_B.111 empty_S.111
+randomitems sea_fish
 end
 Object sea_nse
 name sea
@@ -106,6 +115,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface sea_D.111 empty_S.111
+randomitems sea_fish
 end
 Object sea_sew
 name sea
@@ -115,6 +125,7 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface sea_E.111 empty_S.111
+randomitems sea_fish
 end
 Object sea_nsew
 name sea
@@ -124,4 +135,5 @@ no_pick 1
 is_water 1
 smoothlevel 255
 smoothface sea_E.111 empty_S.111
+randomitems sea_fish
 end
diff --git a/ground/shallow_sea.arc b/ground/shallow_sea.arc
index bcfbe6c69..1ccdab852 100644
--- a/ground/shallow_sea.arc
+++ b/ground/shallow_sea.arc
@@ -13,5 +13,5 @@ no_pick 1
 is_water 1
 is_floor 1
 move_block all
-randomitems fish
+randomitems sea_fish
 end
diff --git a/river/river.arc b/river/river.arc
index c32646315..f839ce90f 100644
--- a/river/river.arc
+++ b/river/river.arc
@@ -4,6 +4,7 @@ name river
 move_block all
 no_pick 1
 is_water 1
+randomitems freshwater_fish
 end
 Object river_n-s
 face river_15.111
@@ -11,6 +12,7 @@ name river
 move_block all
 no_pick 1
 is_water 1
+randomitems freshwater_fish
 end
 Object river_sw-n
 face river_16.111
@@ -18,6 +20,7 @@ name river
 move_block all
 no_pick 1
 is_water 1
+randomitems freshwater_fish
 end
 Object river_ne-s
 face river_25.111
@@ -25,6 +28,7 @@ name river
 move_block all
 no_pick 1
 is_water 1
+randomitems freshwater_fish
 end
 Object river_sw-ne
 face river_26.111
@@ -32,6 +36,7 @@ name river
 move_block all
 no_pick 1
 is_water 1
+randomitems freshwater_fish
 end
 Object river_sw-ne_l
 face river_26.211
@@ -39,6 +44,7 @@ name river
 move_block all
 no_pick 1
 is_water 1
+randomitems freshwater_fish
 end
 Object river_sw-ne_u
 face river_26.311
@@ -46,6 +52,7 @@ name river
 move_block all
 no_pick 1
 is_water 1
+randomitems freshwater_fish
 end
 Object river_ne-w
 face river_27.111
@@ -53,6 +60,7 @@ name river
 move_block all
 no_pick 1
 is_water 1
+randomitems freshwater_fish
 end
 Object river_sw-e
 face river_36.111
@@ -60,6 +68,7 @@ name river
 move_block all
 no_pick 1
 is_water 1
+randomitems freshwater_fish
 end
 Object river_w-e
 face river_37.111
@@ -67,6 +76,7 @@ name river
 move_block all
 no_pick 1
 is_water 1
+randomitems freshwater_fish
 end
 Object river_nw-e
 face river_38.111
@@ -74,6 +84,7 @@ name river
 move_block all
 no_pick 1
 is_water 1
+randomitems freshwater_fish
 end
 Object river_se-w
 face river_47.111
@@ -81,6 +92,7 @@ name river
 move_block all
 no_pick 1
 is_water 1
+randomitems freshwater_fish
 end
 Object river_nw-se
 face river_48.111
@@ -88,6 +100,7 @@ name river
 move_block all
 no_pick 1
 is_water 1
+randomitems freshwater_fish
 end
 Object river_nw-se_l
 face river_48.211
@@ -95,6 +108,7 @@ name river
 move_block all
 no_pick 1
 is_water 1
+randomitems freshwater_fish
 end
 Object river_nw-se_u
 face river_48.311
@@ -102,6 +116,7 @@ name river
 move_block all
 no_pick 1
 is_water 1
+randomitems freshwater_fish
 end
 Object river_nw-s
 face river_58.111
@@ -109,4 +124,5 @@ name river
 move_block all
 no_pick 1
 is_water 1
+randomitems freshwater_fish
 end