diff --git a/data/map.txt b/data/map.txt
index 9637e21..79694a5 100644
--- a/data/map.txt
+++ b/data/map.txt
@@ -1035,7 +1035,6 @@ planet Forge
 	outfitter bunrodea
 	outfitter sheragi
 	outfitter "Common Outfits"
-	outfitter "Basic Weapons"
 	outfitter "Ammo North"
 	outfitter "Ammo South"
 	outfitter "Deep Sky Basics"
@@ -1048,7 +1047,9 @@ planet Forge
 	outfitter "Syndicate Advanced"
 	outfitter "Kraz Basics"
 	outfitter "Kraz Advanced"
-	outfitter "Pirate Outfits"
+	outfitter "Pirate Basics"
+	outfitter "Pirate Advanced"
+	outfitter "South Pirate Advanced"
 	outfitter "Hai Basics"
 	outfitter "Hai Intermediate"
 	outfitter "Hai Advanced"
@@ -1140,7 +1141,6 @@ planet Human
 	outfitter human
 	outfitter "Basic Outfits"
 	outfitter "Common Outfits"
-	outfitter "Basic Weapons"
 	outfitter "Ammo North"
 	outfitter "Ammo South"
 	outfitter "Deep Sky Basics"
@@ -1153,7 +1153,9 @@ planet Human
 	outfitter "Syndicate Advanced"
 	outfitter "Kraz Basics"
 	outfitter "Kraz Advanced"
-	outfitter "Pirate Outfits"
+	outfitter "Pirate Basics"
+	outfitter "Pirate Advanced"
+	outfitter "South Pirate Advanced"
 	outfitter "Stack Core"
 	outfitter "Nuke"
 	outfitter drive