diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json
index d8e190ecef5ea..44bd97af8e0fd 100644
--- a/data/json/items/melee/swords_and_blades.json
+++ b/data/json/items/melee/swords_and_blades.json
@@ -15,7 +15,7 @@
     "to_hit": { "grip": "solid", "length": "long", "surface": "line", "balance": "good" },
     "price_postapoc": 50,
     "flags": [ "SHEATH_SWORD" ],
-    "weapon_category": [ "MEDIUM_SWORDS" ],
+    "weapon_category": [ "CONSTRUCTED_SWORDS", "MEDIUM_SWORDS" ],
     "techniques": [ "WBLOCK_1" ]
   },
   {
@@ -34,7 +34,7 @@
     "to_hit": { "grip": "weapon", "length": "long", "surface": "every", "balance": "uneven" },
     "price_postapoc": 100,
     "techniques": [ "WBLOCK_1" ],
-    "weapon_category": [ "MEDIUM_SWORDS" ]
+    "weapon_category": [ "CONSTRUCTED_SWORDS", "MEDIUM_SWORDS" ]
   },
   {
     "type": "GENERIC",
@@ -52,7 +52,7 @@
     "to_hit": { "grip": "solid", "length": "long", "surface": "every", "balance": "uneven" },
     "price_postapoc": 250,
     "flags": [ "SHEATH_SWORD" ],
-    "weapon_category": [ "MEDIUM_SWORDS" ],
+    "weapon_category": [ "CONSTRUCTED_SWORDS", "MEDIUM_SWORDS" ],
     "qualities": [ [ "BUTCHER", -50 ] ],
     "techniques": [ "WBLOCK_1" ]
   },
@@ -73,7 +73,7 @@
     "to_hit": { "grip": "weapon", "length": "long", "surface": "line", "balance": "neutral" },
     "price_postapoc": 500,
     "flags": [ "SHEATH_SWORD" ],
-    "weapon_category": [ "MEDIUM_SWORDS" ],
+    "weapon_category": [ "CONSTRUCTED_SWORDS", "MEDIUM_SWORDS" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 2 ] ],
     "techniques": [ "WBLOCK_2" ]
   },
@@ -420,7 +420,7 @@
     "techniques": [ "WBLOCK_2", "RAPID" ],
     "qualities": [ [ "CUT", 2 ], [ "BUTCHER", 8 ] ],
     "flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ],
-    "weapon_category": [ "MEDIUM_SWORDS", "FENCING_WEAPONRY" ],
+    "weapon_category": [ "MEDIEVAL_SWORDS", "MEDIUM_SWORDS", "FENCING_WEAPONRY" ],
     "category": "weapons"
   },
   {
@@ -576,7 +576,7 @@
     "material": [ "steel" ],
     "techniques": [ "WBLOCK_2", "PRECISE" ],
     "flags": [ "STAB", "DURABLE_MELEE", "SHEATH_SWORD" ],
-    "weapon_category": [ "FENCING_WEAPONRY" ],
+    "weapon_category": [ "MEDIEVAL_SWORDS", "LONG_SWORDS", "FENCING_WEAPONRY" ],
     "weight": "1814 g",
     "volume": "2750 ml",
     "longest_side": "130 cm",
@@ -625,7 +625,7 @@
     "price_postapoc": 6000,
     "material": [ "steel" ],
     "flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ],
-    "weapon_category": [ "LONG_SWORDS" ],
+    "weapon_category": [ "MEDIEVAL_SWORDS", "LONG_SWORDS" ],
     "techniques": [ "WBLOCK_2" ],
     "weight": "1814 g",
     "volume": "2750 ml",
@@ -682,7 +682,7 @@
     "to_hit": { "grip": "weapon", "length": "long", "surface": "line", "balance": "good" },
     "category": "weapons",
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 8 ] ],
-    "weapon_category": [ "MEDIUM_SWORDS" ]
+    "weapon_category": [ "MEDIEVAL_SWORDS", "MEDIUM_SWORDS" ]
   },
   {
     "id": "arming_sword_fake",
@@ -878,7 +878,7 @@
     "techniques": [ "RAPID", "WBLOCK_2" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 13 ] ],
     "flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ],
-    "weapon_category": [ "SHORT_SWORDS" ],
+    "weapon_category": [ "JAPANESE_SWORDS", "SHORT_SWORDS" ],
     "category": "weapons"
   },
   {
@@ -900,6 +900,7 @@
     "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 4 ] ],
     "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "ALWAYS_TWOHAND" ],
+    "weapon_category": [ "MEDIEVAL_SWORDS" ],
     "category": "weapons"
   },
   {
@@ -985,7 +986,7 @@
     "techniques": [ "WBLOCK_1", "RAPID", "WIDE", "BRUTAL" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 10 ] ],
     "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "ALWAYS_TWOHAND" ],
-    "weapon_category": [ "LONG_SWORDS" ],
+    "weapon_category": [ "JAPANESE_SWORDS", "LONG_SWORDS" ],
     "category": "weapons"
   },
   {
@@ -1238,7 +1239,7 @@
     "techniques": [ "WBLOCK_2" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 9 ] ],
     "flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ],
-    "weapon_category": [ "MEDIUM_SWORDS", "FENCING_WEAPONRY" ],
+    "weapon_category": [ "MEDIEVAL_SWORDS", "MEDIUM_SWORDS", "FENCING_WEAPONRY" ],
     "category": "weapons"
   },
   {
@@ -1321,7 +1322,7 @@
     "techniques": [ "RAPID", "WBLOCK_2" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 9 ] ],
     "flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ],
-    "weapon_category": [ "MEDIUM_SWORDS" ],
+    "weapon_category": [ "JAPANESE_SWORDS", "MEDIUM_SWORDS" ],
     "category": "weapons"
   },
   {
@@ -1505,7 +1506,7 @@
     "techniques": [ "WBLOCK_2" ],
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 9 ] ],
     "flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ],
-    "weapon_category": [ "SHORT_SWORDS" ],
+    "weapon_category": [ "MEDIEVAL_SWORDS", "SHORT_SWORDS" ],
     "category": "weapons"
   },
   {
diff --git a/data/json/martialarts.json b/data/json/martialarts.json
index 07fdce0ff71ab..3ed7c0bbbceca 100644
--- a/data/json/martialarts.json
+++ b/data/json/martialarts.json
@@ -821,32 +821,7 @@
       }
     ],
     "techniques": [ "tec_swordsmanship_feint", "tec_swordsmanship_lethal", "tec_swordsmanship_ringen" ],
-    "weapons": [
-      "arming_sword",
-      "arming_sword_inferior",
-      "arming_sword_fake",
-      "broadsword",
-      "broadsword_inferior",
-      "broadsword_fake",
-      "estoc",
-      "estoc_inferior",
-      "estoc_fake",
-      "longsword",
-      "longsword_inferior",
-      "longsword_fake",
-      "sword_crude",
-      "sword_nail",
-      "sword_wood",
-      "sword_metal",
-      "zweihander",
-      "zweihander_inferior",
-      "zweihander_fake",
-      "cutlass",
-      "cutlass_fake",
-      "cutlass_inferior",
-      "cavalry_sabre",
-      "cavalry_sabre_fake"
-    ]
+    "weapon_category": [ "MEDIEVAL_SWORDS", "CONSTRUCTED_SWORDS" ]
   },
   {
     "type": "martial_art",
diff --git a/data/json/weapon_categories.json b/data/json/weapon_categories.json
index c07aad4543764..be59fd3e88fa8 100644
--- a/data/json/weapon_categories.json
+++ b/data/json/weapon_categories.json
@@ -73,5 +73,20 @@
     "type": "weapon_category",
     "id": "BIONIC_WEAPONRY",
     "name": "BIONIC WEAPONRY"
+  },
+  {
+    "type": "weapon_category",
+    "id": "MEDIEVAL_SWORDS",
+    "name": "MEDIEVAL SWORDS"
+  },
+  {
+    "type": "weapon_category",
+    "id": "CONSTRUCTED_SWORDS",
+    "name": "CONSTRUCTED SWORDS"
+  },
+  {
+    "type": "weapon_category",
+    "id": "JAPANESE_SWORDS",
+    "name": "JAPANESE SWORDS"
   }
 ]