diff --git a/DATA/MISSIONS/mbases.ini b/DATA/MISSIONS/mbases.ini
index 3d00ce80..ad4fbb61 100644
--- a/DATA/MISSIONS/mbases.ini
+++ b/DATA/MISSIONS/mbases.ini
@@ -23340,6 +23340,8 @@ character_density = 2
 fixture = ku0102_fix_trader, Zs/NPC/Trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader
 fixture = ku0102_fix_weaponsdealer, Zs/NPC/Equipment/01/A/Stand, scripts\vendors\li_equipdealer_fidget.thn, Equipment
 
+; Yokohama Shipyard
+
 [MBase]
 nickname = Ku01_03_Base
 local_faction = co_shi_grp
diff --git a/DATA/UNIVERSE/SYSTEMS/KU01/BASES/ROOMS/ku01_03_bar.ini b/DATA/UNIVERSE/SYSTEMS/KU01/BASES/ROOMS/ku01_03_bar.ini
index 1d2b8b85..daaac8d6 100644
--- a/DATA/UNIVERSE/SYSTEMS/KU01/BASES/ROOMS/ku01_03_bar.ini
+++ b/DATA/UNIVERSE/SYSTEMS/KU01/BASES/ROOMS/ku01_03_bar.ini
@@ -35,6 +35,11 @@ behavior = ExitDoor
 room_switch = Deck
 set_virtual_room = Equipment
 
+[Hotspot]
+name = IDS_HOTSPOT_SHIPDEALER_ROOM
+behavior = ExitDoor
+room_switch = ShipDealer
+
 [Hotspot]
 name = IDS_HOTSPOT_NEWSVENDOR
 behavior = NewsVendor
diff --git a/DATA/UNIVERSE/SYSTEMS/KU01/BASES/ROOMS/ku01_03_deck.ini b/DATA/UNIVERSE/SYSTEMS/KU01/BASES/ROOMS/ku01_03_deck.ini
index 96e18765..a13c8455 100644
--- a/DATA/UNIVERSE/SYSTEMS/KU01/BASES/ROOMS/ku01_03_deck.ini
+++ b/DATA/UNIVERSE/SYSTEMS/KU01/BASES/ROOMS/ku01_03_deck.ini
@@ -32,6 +32,11 @@ name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM
 behavior = VirtualRoom
 room_switch = Equipment
 
+[Hotspot]
+name = IDS_HOTSPOT_SHIPDEALER_ROOM
+behavior = ExitDoor
+room_switch = ShipDealer
+
 [Hotspot]
 name = IDS_NN_REPAIR_YOUR_SHIP
 behavior = Repair