diff --git a/Source/BuildControl.cs b/Source/BuildControl.cs
index dc60c56d..7f358da7 100644
--- a/Source/BuildControl.cs
+++ b/Source/BuildControl.cs
@@ -679,6 +679,9 @@ internal void BuildAndLaunchCraft ()
 
 			Box vessel_bounds = GetVesselBox (nship);
 			var rootPart = nship.parts[0].localRoot;
+			var ro = rootPart.gameObject;
+			var od = ro.GetComponent<OrbitDriver> () ?? ro.AddComponent<OrbitDriver> ();
+			od.orbit = new Orbit(builder.vessel.orbit);
 			var shipTransform = rootPart.transform;
 			builder.SetShipTransform (shipTransform, rootPart);
 			builder.PlaceShip (shipTransform, vessel_bounds);
@@ -688,6 +691,7 @@ internal void BuildAndLaunchCraft ()
 												flag, game, crew);
 			var craftVessel = nship.parts[0].localRoot.GetComponent<Vessel> ();
 			craftVessel.launchedFrom = builder.LaunchedFrom;
+			od.vessel = craftVessel;
 
 			FlightGlobals.ForceSetActiveVessel (craftVessel);
 			SetCraftOrbit (craftVessel, OrbitDriver.UpdateMode.IDLE);