diff --git a/data/json/items/ammo/flintlock.json b/data/json/items/ammo/flintlock.json
index f68c9b72e099..31761fb158af 100644
--- a/data/json/items/ammo/flintlock.json
+++ b/data/json/items/ammo/flintlock.json
@@ -36,7 +36,7 @@
     "color": "white",
     "count": 30,
     "stack_size": 10,
-    "ammo_type": "flintlock",
+    "ammo_type": "flintlockshot",
     "range": 8,
     "damage": { "damage_type": "bullet", "amount": 63 },
     "dispersion": 20,
diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json
index 7b5116ccb54d..af6071acc6d9 100644
--- a/data/json/items/ammo_types.json
+++ b/data/json/items/ammo_types.json
@@ -510,6 +510,12 @@
     "name": "paper cartridge",
     "default": "flintlock_ammo"
   },
+  {
+    "type": "ammunition_type",
+    "id": "flintlockshot",
+    "name": "paper shot cartridge",
+    "default": "flintlock_shot"
+  },
   {
     "type": "ammunition_type",
     "id": "papershot",
diff --git a/data/json/items/gun/flintlock.json b/data/json/items/gun/flintlock.json
index be8024c0c4fb..1e0b4bf1745f 100644
--- a/data/json/items/gun/flintlock.json
+++ b/data/json/items/gun/flintlock.json
@@ -48,8 +48,7 @@
     "bashing": 5,
     "material": [ "iron", "wood" ],
     "color": "brown",
-    "ammo": "flintlock",
-    "range": 2,
+    "ammo": ["flintlock", "flintlockshot"],
     "ranged_damage": { "damage_type": "bullet", "amount": 2 },
     "dispersion": 620,
     "durability": 6,
@@ -80,8 +79,8 @@
     "bashing": 15,
     "material": [ "iron", "wood" ],
     "color": "brown",
-    "ammo": "flintlock",
-    "range": 6,
+    "ammo": ["flintlock", "flintlockshot"],
+    "range": 4,
     "ranged_damage": { "damage_type": "bullet", "amount": 10 },
     "dispersion": 180,
     "durability": 6,
@@ -107,7 +106,8 @@
     "description": "Also called a Pennsylvania rifle, this long barreled rifled flintlock gun has signficantly increased accuracy at the cost of taking even longer to reload.",
     "weight": "3700 g",
     "volume": "1700 ml",
-    "relative": { "range": 2 },
+    "ammo": "flintlock",
+    "relative": { "range": 14 },
     "proportional": { "dispersion": 0.5, "reload": 2.0 }
   }
 ]