X-ray polarimetry promises exciting insights into the physics of compact astrophysical objects by providing two observables: the polarization fraction and angle as function of energy. X-Calibur is a balloon-borne hard x-ray scattering polarimeter for the 15- to 60-keV energy range. After the successful test flight in September 2016, the instrument is now being prepared for a long-duration balloon (LDB) flight in December 2018 through January 2019. During the LDB flight, X-Calibur will make detailed measurements of the polarization of Vela X-1 and constrain the polarization of a sample of between 4 and 9 additional sources. We describe the upgraded polarimeter design, including the use of a beryllium scattering element, lower-noise front-end electronics, and an improved fully active CsI(Na) anticoincidence shield, which will significantly increase the instrument sensitivity. We present estimates of the improved polarimeter performance based on simulations and laboratory measurements. We present some of the results from the 2016 flight and show that we solved several problems, which led to a reduced sensitivity during the 2016 flight. We end with a description of the planned Vela X-1 observations, including a Swift/BAT-guided observation strategy.