diff --git a/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json b/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json
index 67da70c17aea..32d621654ac5 100644
--- a/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json
+++ b/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json
@@ -262,6 +262,7 @@
       { "item": "hk_mp5k", "prob": 4 },
       { "item": "briefcase_smg", "prob": 1 },
       { "item": "TDI", "prob": 4 },
+      { "item": "kriss_vector", "prob": 4 },
       { "item": "savage_111f", "prob": 10 },
       { "item": "ak47", "prob": 16 },
       { "item": "ak74", "prob": 4 },
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/everydaycarry_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/everydaycarry_guns.json
index 45ed4dca81a4..9c86fc99e848 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/everydaycarry_guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/everydaycarry_guns.json
@@ -716,6 +716,17 @@
       { "group": "nested_TDI_mag", "charges-min": 0, "prob": 50 }
     ]
   },
+  {
+    "id": "everyday_kriss_vector",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
+    "subtype": "collection",
+    "entries": [
+      { "item": "kriss_vector", "ammo-group": "on_hand_40", "charges": [ 0, 30 ] },
+      { "group": "nested_kriss_vector_mag", "charges-min": 0 },
+      { "group": "nested_kriss_vector_mag", "charges-min": 0, "prob": 50 }
+    ]
+  },
   {
     "id": "everyday_american_180",
     "type": "item_group",
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
index aef03a681b1b..985b04a0ccdd 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -322,6 +322,7 @@
       { "group": "nested_hk_mp5sd", "prob": 5 },
       { "group": "nested_hk_ump45", "prob": 30 },
       { "group": "nested_TDI", "prob": 10 },
+      { "group": "nested_kriss_vector", "prob": 10 },
       { "group": "nested_american_180", "prob": 50 },
       { "group": "nested_briefcase_smg", "prob": 5 },
       { "group": "nested_tec9", "prob": 50 }
@@ -338,6 +339,7 @@
       { "group": "everyday_hk_mp5sd", "prob": 5 },
       { "group": "everyday_hk_ump45", "prob": 30 },
       { "group": "everyday_TDI", "prob": 10 },
+      { "group": "everyday_kriss_vector", "prob": 10 },
       { "group": "everyday_american_180", "prob": 50 },
       { "group": "everyday_briefcase_smg", "prob": 5 },
       { "group": "everyday_tec9", "prob": 50 }
@@ -356,6 +358,7 @@
       { "item": "mac_10", "prob": 40, "charges-min": 0, "charges-max": 0 },
       { "item": "mac_11", "prob": 20, "charges-min": 0, "charges-max": 0 },
       { "item": "TDI", "prob": 10, "charges-min": 0, "charges-max": 0 },
+      { "item": "kriss_vector", "prob": 10, "charges-min": 0, "charges-max": 0 },
       { "item": "american_180", "prob": 50, "charges-min": 0, "charges-max": 0 },
       { "item": "briefcase_smg", "prob": 5, "charges-min": 0, "charges-max": 0 },
       { "item": "tec9", "prob": 50, "charges-min": 0, "charges-max": 0 }
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
index d9b9a6240f71..f8f18948bc7b 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
@@ -202,6 +202,7 @@
       [ "stenmag", 5 ],
       [ "tec9mag", 10 ],
       [ "tdi_mag", 5 ],
+      [ "kriss_mag", 5 ],
       [ "thompson_mag", 5 ],
       [ "ump45mag", 5 ],
       [ "uzimag", 10 ]
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
index f2cdcd21a390..4982a76555db 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
@@ -1055,6 +1055,18 @@
       { "group": "on_hand_45" }
     ]
   },
+  {
+    "id": "nested_kriss_vector",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
+    "subtype": "collection",
+    "entries": [
+      { "item": "kriss_vector", "ammo-group": "on_hand_40", "charges": [ 0, 30 ] },
+      { "group": "nested_kriss_vector_mag", "charges-min": 0 },
+      { "group": "nested_kriss_vector_mag", "charges-min": 0, "prob": 50 },
+      { "group": "on_hand_40" }
+    ]
+  },
   {
     "id": "nested_american_180",
     "type": "item_group",
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_magazines.json
index d7229255084b..3544234a3a27 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/nested_magazines.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_magazines.json
@@ -210,6 +210,18 @@
       { "item": "glock21drum40rd", "ammo-group": "on_hand_45", "prob": 5 }
     ]
   },
+  {
+    "id": "nested_kriss_vector_mag",
+    "type": "item_group",
+    "subtype": "distribution",
+    "ammo": 100,
+    "entries": [
+      { "item": "kriss_mag", "ammo-group": "on_hand_40", "prob": 100 },
+      { "item": "glock40mag", "ammo-group": "on_hand_40", "prob": 5 },
+      { "item": "glock40bigmag", "ammo-group": "on_hand_40", "prob": 5 },
+      { "item": "glock40drum50rd", "ammo-group": "on_hand_40", "prob": 5 }
+    ]
+  },
   {
     "id": "nested_hk_mp7_mag",
     "type": "item_group",
diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json
index 5a86d48c3426..510659eaa7d6 100644
--- a/data/json/items/gun/40.json
+++ b/data/json/items/gun/40.json
@@ -299,5 +299,29 @@
     "durability": 10,
     "min_cycle_recoil": 400,
     "magazines": [ [ "40", [ "glock40mag", "glock40bigmag", "glock40drum50rd" ] ] ]
+  },
+  {
+    "id": "kriss_vector",
+    "copy-from": "smg_base",
+    "looks_like": "TDI",
+    "type": "GUN",
+    "name": { "str": "KRISS Vector" },
+    "description": "The KRISS Vector is a submachine gun with a unique, in-line design that makes recoil very manageable.  It is a evolution of the formally known TDI Vector, this particullar model uses .40 S&W.",
+    "weight": "3100 g",
+    "volume": "1750 ml",
+    "barrel_length": "150 ml",
+    "price": "3100 USD",
+    "price_postapoc": "35 USD",
+    "to_hit": -2,
+    "bashing": 9,
+    "material": [ "steel", "plastic" ],
+    "color": "dark_gray",
+    "ammo": "40",
+    "dispersion": 280,
+    "durability": 7,
+    "min_cycle_recoil": 540,
+    "modes": [ [ "DEFAULT", "semi", 1 ], [ "AUTO", "auto", 6 ] ],
+    "magazine_well": "500 ml",
+    "magazines": [ [ "40", [ "kriss_mag", "glock40mag", "glock40bigmag", "glock40drum50rd" ] ] ]
   }
 ]
diff --git a/data/json/items/magazine/40.json b/data/json/items/magazine/40.json
index 03de3ff99dbe..27d983291931 100644
--- a/data/json/items/magazine/40.json
+++ b/data/json/items/magazine/40.json
@@ -233,5 +233,23 @@
     "capacity": 10,
     "reliability": 8,
     "flags": [ "MAG_COMPACT" ]
+  },
+  {
+    "id": "kriss_mag",
+    "looks_like": "tdi_mag",
+    "type": "MAGAZINE",
+    "name": { "str": "KRISS Vector magazine" },
+    "description": "A 30-round steel box magazine for use with the KRISS Vector",
+    "weight": "210 g",
+    "volume": "500 ml",
+    "price": "18 USD",
+    "price_postapoc": "1 USD",
+    "material": "steel",
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": "40",
+    "capacity": 30,
+    "reliability": 9,
+    "flags": [ "MAG_COMPACT" ]
   }
 ]
diff --git a/data/json/uncraft/magazine/45.json b/data/json/uncraft/magazine/45.json
index f99b75ee0c8c..c7ff373a7af9 100644
--- a/data/json/uncraft/magazine/45.json
+++ b/data/json/uncraft/magazine/45.json
@@ -20,6 +20,13 @@
     "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
     "components": [ [ [ "scrap", 1 ] ] ]
   },
+  {
+    "result": "kriss_mag",
+    "type": "uncraft",
+    "copy-from": "metal_magazine",
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
+    "components": [ [ [ "scrap", 1 ] ] ]
+  },
   {
     "result": "thompson_bigmag",
     "type": "uncraft",
diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
index 681bb0eb979e..6fd8c5caa53b 100644
--- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
+++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -152,7 +152,7 @@
     "replace": "pistol_revolver"
   },
   {
-    "id": [ "ppsh", "hk_mp5", "hk_mp5sd", "uzi", "TDI", "hk_ump45", "fn_p90", "needlegun", "rm2000_smg", "sten" ],
+    "id": [ "ppsh", "hk_mp5", "hk_mp5sd", "uzi", "TDI", "kriss_vector", "hk_ump45", "fn_p90", "needlegun", "rm2000_smg", "sten" ],
     "type": "MIGRATION",
     "replace": "pistol_smg"
   },
diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json
index 856132ecab8a..39206b862127 100644
--- a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json
+++ b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json
@@ -96,6 +96,7 @@
       "mac10mag",
       "smg_45_mag",
       "tdi_mag",
+      "kriss_mag",
       "thompson_mag",
       "thompson_makeshiftmag",
       "ump45mag",