diff --git a/scripts/_unpack/377/all.loc b/scripts/_unpack/377/all.loc
index 890d932de0..069b292e1b 100644
--- a/scripts/_unpack/377/all.loc
+++ b/scripts/_unpack/377/all.loc
@@ -94124,6 +94124,7 @@ recol2d=12548
 length=2
 blockrange=no
 blockrange=no
+category=watersource
 
 [qip_cook_cookingshelves]
 name=Shelves
diff --git a/scripts/_unpack/377/all.obj b/scripts/_unpack/377/all.obj
index 1ccd91b415..9c848741e4 100644
--- a/scripts/_unpack/377/all.obj
+++ b/scripts/_unpack/377/all.obj
@@ -63699,6 +63699,7 @@ womanwear=obj_watering_can_0_manwear,0
 members=yes
 cost=8
 weight=100g
+category=watering_can
 
 [cert_watering_can_0]
 certlink=watering_can_0
@@ -63717,6 +63718,8 @@ manwear=obj_watering_can_0_manwear,0
 womanwear=obj_watering_can_0_manwear,0
 members=yes
 weight=200g
+category=watering_can
+param=next_obj_stage,watering_can_0
 
 [watering_can_2]
 name=Watering can(2)
@@ -63731,6 +63734,8 @@ manwear=obj_watering_can_0_manwear,0
 womanwear=obj_watering_can_0_manwear,0
 members=yes
 weight=300g
+category=watering_can
+param=next_obj_stage,watering_can_1
 
 [watering_can_3]
 name=Watering can(3)
@@ -63745,6 +63750,8 @@ manwear=obj_watering_can_0_manwear,0
 womanwear=obj_watering_can_0_manwear,0
 members=yes
 weight=400g
+category=watering_can
+param=next_obj_stage,watering_can_2
 
 [watering_can_4]
 name=Watering can(4)
@@ -63759,6 +63766,8 @@ manwear=obj_watering_can_0_manwear,0
 womanwear=obj_watering_can_0_manwear,0
 members=yes
 weight=500g
+category=watering_can
+param=next_obj_stage,watering_can_3
 
 [watering_can_5]
 name=Watering can(5)
@@ -63773,6 +63782,8 @@ manwear=obj_watering_can_0_manwear,0
 womanwear=obj_watering_can_0_manwear,0
 members=yes
 weight=600g
+category=watering_can
+param=next_obj_stage,watering_can_4
 
 [watering_can_6]
 name=Watering can(6)
@@ -63787,6 +63798,8 @@ manwear=obj_watering_can_0_manwear,0
 womanwear=obj_watering_can_0_manwear,0
 members=yes
 weight=700g
+category=watering_can
+param=next_obj_stage,watering_can_5
 
 [watering_can_7]
 name=Watering can(7)
@@ -63801,6 +63814,8 @@ manwear=obj_watering_can_0_manwear,0
 womanwear=obj_watering_can_0_manwear,0
 members=yes
 weight=800g
+category=watering_can
+param=next_obj_stage,watering_can_6
 
 [watering_can_8]
 name=Watering can(8)
@@ -63815,6 +63830,8 @@ manwear=obj_watering_can_0_manwear,0
 womanwear=obj_watering_can_0_manwear,0
 members=yes
 weight=900g
+category=watering_can
+param=next_obj_stage,watering_can_7
 
 [rake]
 name=Rake
diff --git a/scripts/general_use/scripts/water_sources.rs2 b/scripts/general_use/scripts/water_sources.rs2
index 776b7bf1ba..8fbaf1e93e 100644
--- a/scripts/general_use/scripts/water_sources.rs2
+++ b/scripts/general_use/scripts/water_sources.rs2
@@ -6,6 +6,7 @@ switch_obj (last_useitem)
     case bucket_empty, jug_empty : @water_fill(last_useslot, last_slot);
     case potato, cooked_meat, cooked_chicken : @make_incomplete_stew(last_useslot);
     case water_skin3, water_skin2, water_skin1, water_skin0 : @water_fill(last_useslot, last_slot);
+    case watering_can_0, watering_can_1, watering_can_2, watering_can_3, watering_can_4, watering_can_5, watering_can_6, watering_can_7 : @fill_watering_can_with(last_useslot, last_slot);
     case default : ~displaymessage(^dm_default);
 };
 
@@ -17,6 +18,7 @@ switch_obj (last_useitem)
     case clay : @make_softclay(bucket_water);
     case jug_empty, bowl_empty : @water_fill(last_useslot, last_slot);
     case water_skin3, water_skin2, water_skin1, water_skin0 : @water_fill(last_useslot, last_slot);
+    case watering_can_0, watering_can_1, watering_can_2, watering_can_3, watering_can_4, watering_can_5, watering_can_6, watering_can_7 : @fill_watering_can_with(last_useslot, last_slot);
     case default : ~displaymessage(^dm_default);
 };
 
@@ -28,6 +30,7 @@ switch_obj (last_useitem)
     case clay : @make_softclay(jug_water);
     case bucket_empty, bowl_empty : @water_fill(last_useslot, last_slot);
     case water_skin3, water_skin2, water_skin1, water_skin0 : @water_fill(last_useslot, last_slot);
+    case watering_can_0, watering_can_1, watering_can_2, watering_can_3, watering_can_4, watering_can_5, watering_can_6, watering_can_7 : @fill_watering_can_with(last_useslot, last_slot);
     case default : ~displaymessage(^dm_default);
 };
 
@@ -63,6 +66,7 @@ inv_setslot(inv, $use_slot, oc_param($used_with, next_obj_stage), 1); //new empt
 [oplocu,_watersource]
 switch_obj (last_useitem) {
     case bucket_empty, jug_empty, vial_empty, bowl_empty, goldbowl_empty, goldbowlbless_empty : @fill_container_water(last_useitem);
+    case watering_can_0, watering_can_1, watering_can_2, watering_can_3, watering_can_4, watering_can_5, watering_can_6, watering_can_7 : @fill_watering_can(last_useitem);
     case default : ~displaymessage(^dm_default);
 }
 
@@ -91,3 +95,14 @@ sound_synth(well_fill, 0, 0);
 mes("You fill the bucket from the well.");
 // strongqueued in osrs but that was likely changed in Sept 2005 
 p_delay(0);
+
+[label,fill_watering_can_with](int $canslot, int $itemslot)
+def_obj $wateringcan = inv_getobj(inv, $canslot);
+def_obj $wateritem = inv_getobj(inv, $itemslot);
+
+inv_setslot(inv, $itemslot, oc_param($wateritem, next_obj_stage), 1);
+@fill_watering_can($wateringcan);
+
+[label,fill_watering_can](obj $watering_can)
+inv_del(inv, $watering_can, 1);
+inv_add(inv, watering_can_8, 1);