Index: code/ship/ship.cpp
===================================================================
--- code/ship/ship.cpp	(revision 11171)
+++ code/ship/ship.cpp	(working copy)
@@ -14515,10 +14515,19 @@
 	float		dist = 0.0f;
 	object	*objp;	
 	float		min_speed, max_speed;
+	ai_goal *aigp = NULL;
 
 	objp = &Objects[sp->objnum];
 	aip = &Ai_info[sp->ai_index];
 
+	if (Game_mode & GM_MULTIPLAYER & !MULTIPLAYER_MASTER) {
+		if ( aip->mode == AIM_WAYPOINTS ){
+			aigp = &aip->goals[aip->active_goal];
+			aip->wp_list = find_matching_waypoint_list(aigp->target_name);
+			aip->wp_index = 0;
+		}
+	}
+
 	min_speed = objp->phys_info.speed;
 
 	// Goober5000 - handle cap