diff --git a/data/json/items/resources/wood.json b/data/json/items/resources/wood.json
index 18c2a45f3430e..597349dcf091f 100644
--- a/data/json/items/resources/wood.json
+++ b/data/json/items/resources/wood.json
@@ -93,6 +93,35 @@
     "qualities": [ [ "HAMMER", 1 ] ],
     "melee_damage": { "bash": 19 }
   },
+  {
+    "type": "GENERIC",
+    "id": "soaking_spear_shaft",
+    "symbol": "/",
+    "color": "brown",
+    "name": { "str_sp": "soaking spear shaft" },
+    "looks_like": "q_staff",
+    "description": "A long stick carved and sanded into a smooth staff with a slight taper, for use in making spears.  It's currently soaked with oil and quite slippery.  Once the oil penetrates the wood it can be wiped down and used for further projects.",
+    "price": "40 USD",
+    "material": [ "wood" ],
+    "flags": [ "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
+    "weapon_category": [ "QUARTERSTAVES" ],
+    "weight": "1000 g",
+    "volume": "1250 ml",
+    "longest_side": "180 cm",
+    "category": "weapons",
+    "to_hit": { "grip": "bad", "length": "long", "surface": "any", "balance": "good" },
+    "use_action": {
+      "target": "spear_shaft",
+      "msg": "You wipe down the spear shaft.",
+      "moves": 1000,
+      "type": "delayed_transform",
+      "transform_age": 15000,
+      "not_ready_msg": "The spear shaft is still soaking.",
+      "//": "4 hours"
+    },
+    "price_postapoc": "5 USD",
+    "melee_damage": { "bash": 8 }
+  },
   {
     "type": "GENERIC",
     "id": "spear_shaft",
diff --git a/data/json/recipes/other/parts_construction.json b/data/json/recipes/other/parts_construction.json
index c288fd1a101ba..106336ab8352c 100644
--- a/data/json/recipes/other/parts_construction.json
+++ b/data/json/recipes/other/parts_construction.json
@@ -390,17 +390,15 @@
   {
     "type": "recipe",
     "activity_level": "MODERATE_EXERCISE",
-    "result": "spear_shaft",
+    "result": "soaking_spear_shaft",
     "byproducts": [ [ "splinter", 12 ] ],
     "category": "CC_WEAPON",
     "subcategory": "CSC_WEAPON_BASHING",
     "skill_used": "fabrication",
     "difficulty": 2,
-    "time": "5 h 40 m",
-    "//1": "TODO: adjust crafting time down by 4 hours when it's possible to separate the oiling time from the crafting time easily.",
+    "time": "1 h 40 m",
     "autolearn": true,
-    "proficiencies": [ { "proficiency": "prof_carving", "time_multiplier": 1.25, "max_experience": "100 m" } ],
-    "//2": "Max experience set because waiting for oil to soak in isn't really teaching you anything.  Remove this when crafting time reduced to only carving time.",
+    "proficiencies": [ { "proficiency": "prof_carving", "time_multiplier": 1.25 } ],
     "qualities": [
       { "id": "CUT", "level": 2 },
       { "id": "SAW_W", "level": 1 },
diff --git a/data/mods/TEST_DATA/expected_dps_data/staves_dps.json b/data/mods/TEST_DATA/expected_dps_data/staves_dps.json
index 718b601829e8c..f87c1bdf23f0b 100644
--- a/data/mods/TEST_DATA/expected_dps_data/staves_dps.json
+++ b/data/mods/TEST_DATA/expected_dps_data/staves_dps.json
@@ -8,6 +8,7 @@
       "staff_pipe": 11.09,
       "staff_sling": 11.56,
       "spear_shaft": 11.9,
+      "soaking_spear_shaft": 6,
       "hockey_stick": 13.75,
       "q_staff": 15.74,
       "bo": 18.65,