The propeller shaft is one of the most important components in ship construction so this component is given complete and clear standards for technical design, maintenance and repair. in Indonesia, the standard used as a reference is the standard from PT. The Indonesian Classification Bureau (BKI) is the party authorized to issue ship classification certificates in Indonesia. Every five years for passenger ships and cargo ships, ship propeller shafts must be maintained and repaired. This research examines the maintenance and repair process of propeller shafts on passenger and cargo ships, KMP Kirana I. The repair method for the propeller shaft is by coating composites on areas that are eroded due to corrosion and wear. From the results of the inspection when the propeller shaft was removed, it was discovered that the clearance between the shaft and the ship's bushing was greater than the BKI standard. After repairs were carried out with the addition of composite material, the clearance returned to meeting BKI standards.