Spacecraft can be commanded to perform fuel-optimal attitude maneuvers subject to path constraints and specified boundary conditions using techniques from optimal control theory. This thesis presents solutions to two optimal maneuver guidance problems for increasing the robustness of space station Optimal Propellant Maneuvers (OPMs). An optimal maneuver is generated to avoid excess solar heating for use during high solar beta angle conditions. In cases where beta angle is not a factor, ground-based analysis can be reduced by implementing an on-orbit maneuver correction algorithm based on neighboring optimal control theory. This algorithm can be used to find an approximate optimal solution in the presence of uncertainties in the model or initial conditions for the maneuver, and allows on-orbit generation of maneuvers from a reference trajectory even when mass properties are changed due to the docking of visiting vehicles.