diff --git a/data/json/faults/faults_guns.json b/data/json/faults/faults_guns.json
index 63979a3f3b0fc..83035de6df16b 100644
--- a/data/json/faults/faults_guns.json
+++ b/data/json/faults/faults_guns.json
@@ -1,4 +1,12 @@
 [
+  {
+    "id": "fault_gun_flintlock",
+    "type": "fault",
+    "name": { "str": "Flintlock fouling" },
+    "description": "Firing blackpowder loads from a flintlock fouls it, which reduces reliability and, if left uncleaned, leads to rust.  It fouls the gun much faster than the use of modern smokeless powder cartridges.  Fouling is only a significant impact on reliability at high levels, but black powder fouling accumulates quickly.",
+    "item_prefix": "rusting",
+    "flags": [ "BLACKPOWDER_FOULING_DAMAGE", "NO_DIRTYING" ]
+  },
   {
     "id": "fault_gun_blackpowder",
     "type": "fault",
diff --git a/data/json/items/classes/gun.json b/data/json/items/classes/gun.json
index 1f4e7ec4715c7..fe3f2850844bb 100644
--- a/data/json/items/classes/gun.json
+++ b/data/json/items/classes/gun.json
@@ -18,6 +18,18 @@
     ],
     "ranged_damage": { "damage_type": "bullet", "amount": 0 }
   },
+  {
+    "abstract": "flintlock_base",
+    "type": "GUN",
+    "reload_noise_volume": 10,
+    "//": "this is the default handling for anything with a flintlock",
+    "handling": 20,
+    "name": { "str": "flintlock gun" },
+    "symbol": "(",
+    "color": "light_gray",
+    "faults": [ "fault_gun_flintlock", "fault_gun_dirt", "fault_gun_chamber_spent" ],
+    "ranged_damage": { "damage_type": "bullet", "amount": 0 }
+  },
   {
     "abstract": "underbarrel_base",
     "type": "GUN",
diff --git a/data/json/items/generic.json b/data/json/items/generic.json
index 0ba4dcc77b094..60ca1416144f4 100644
--- a/data/json/items/generic.json
+++ b/data/json/items/generic.json
@@ -2200,6 +2200,19 @@
     "symbol": ";",
     "color": "light_gray"
   },
+  {
+    "id": "pipe_dowel",
+    "type": "GENERIC",
+    "name": { "str": "pipe dowel" },
+    "description": "A tool designed to fit inside of pipes, bottles, and similar objects.  This one is thick enough to be used for cleaning flintlock barrels from dirt and fouling.",
+    "weight": "100 g",
+    "volume": "250 ml",
+    "price": "5 USD",
+    "price_postapoc": "50 cent",
+    "material": [ "steel" ],
+    "symbol": ";",
+    "color": "light_gray"
+  },
   {
     "type": "GENERIC",
     "id": "clock",
diff --git a/data/json/items/gun/flintlock.json b/data/json/items/gun/flintlock.json
index 4066192961fb3..47f78f585e1f6 100644
--- a/data/json/items/gun/flintlock.json
+++ b/data/json/items/gun/flintlock.json
@@ -41,6 +41,7 @@
   {
     "id": "pistol_flintlock",
     "looks_like": "glock_17",
+    "copy-from": "flintlock_base",
     "type": "GUN",
     "reload_noise_volume": 10,
     "name": { "str": "flintlock pistol" },
@@ -71,6 +72,7 @@
   {
     "id": "rifle_flintlock",
     "looks_like": "modular_ar15",
+    "copy-from": "flintlock_base",
     "type": "GUN",
     "reload_noise_volume": 10,
     "name": { "str": "flintlock musket" },
diff --git a/data/json/requirements/toolsets.json b/data/json/requirements/toolsets.json
index deee6e9e92d02..3aae96fc53cf3 100644
--- a/data/json/requirements/toolsets.json
+++ b/data/json/requirements/toolsets.json
@@ -28,7 +28,10 @@
     "type": "requirement",
     "//": "Gun cleaning",
     "qualities": [ { "id": "SCREW", "level": 1 } ],
-    "tools": [ [ [ "pipe_cleaner", -1 ], [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ] ],
+    "tools": [
+      [ [ "pipe_cleaner", -1 ], [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ],
+      [ [ "cotton_patchwork", 1 ], [ "fur", 1 ], [ "faux_fur", 1 ], [ "felt_patch", 1 ], [ "cotton_ball", 2 ] ]
+    ],
     "components": [
       [
         [ "gasoline", 125 ],
@@ -44,14 +47,27 @@
         [ "vinegar", 8 ],
         [ "ammonia_hydroxide", 1 ],
         [ "bleach", 1 ]
-      ],
+      ]
+    ]
+  },
+  {
+    "id": "gun_cleaning_flintlock",
+    "type": "requirement",
+    "//": "Flintlocks require a thicker tool to manage the wider barrel and also soapy water to clean the blackpowder.",
+    "qualities": [ { "id": "SCREW", "level": 1 } ],
+    "tools": [
+      [ [ "pipe_dowel", -1 ], [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ],
+      [ [ "water_boiling_heat", 2, "LIST" ] ]
+    ],
+    "components": [
+      [ [ "soapy_water", 3 ] ],
       [ [ "cotton_patchwork", 1 ], [ "fur", 1 ], [ "faux_fur", 1 ], [ "felt_patch", 1 ], [ "cotton_ball", 2 ] ]
     ]
   },
   {
     "id": "gun_cleaning_bp",
     "type": "requirement",
-    "//": "BP requires hot soapy water",
+    "//": "BP requires hot soapy water.  The cloth patch is for cleaning gunk off the rod.  Not reusable because of black powder residue.",
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "tools": [
       [ [ "pipe_cleaner", -1 ], [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ],
@@ -65,9 +81,11 @@
   {
     "id": "gun_cleaning_quick",
     "type": "requirement",
-    "//": "Requires a rod/wire and cloth patch or similar item.",
-    "tools": [ [ [ "pipe_cleaner", -1 ], [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ] ],
-    "components": [ [ [ "cotton_patchwork", 1 ], [ "fur", 1 ], [ "faux_fur", 1 ], [ "felt_patch", 1 ], [ "cotton_ball", 2 ] ] ]
+    "//": "Requires a rod/wire and cloth patch or similar item.  The cloth patch et al is for cleaning gunk off the rod/wire/pipe cleaner.",
+    "tools": [
+      [ [ "pipe_cleaner", -1 ], [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ],
+      [ [ "cotton_patchwork", 1 ], [ "fur", 1 ], [ "faux_fur", 1 ], [ "felt_patch", 1 ] ]
+    ]
   },
   {
     "id": "gun_lubrication",
diff --git a/data/mods/innawood/recipes/recipe_others.json b/data/mods/innawood/recipes/recipe_others.json
index 2a98891654d25..2c4af06fa19af 100644
--- a/data/mods/innawood/recipes/recipe_others.json
+++ b/data/mods/innawood/recipes/recipe_others.json
@@ -53,6 +53,29 @@
       [ [ "plastic_chunk", 1 ] ]
     ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "pipe_dowel",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "mechanics",
+    "difficulty": 1,
+    "time": "2 m",
+    "reversible": true,
+    "autolearn": true,
+    "components": [
+      [
+        [ "wire", 4 ],
+        [ "lc_wire", 4 ],
+        [ "mc_wire", 4 ],
+        [ "hc_wire", 4 ],
+        [ "qt_wire", 4 ],
+        [ "ch_wire", 4 ],
+        [ "cable", 4 ]
+      ]
+    ]
+  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",