In 1454 King Casimir IV Jagiellon re-incorporated the region to the Kingdom of Poland, and after the subsequent Thirteen Years' War the Teutonic Knights renounced their claims to the region in 1466. Afterwards Rumia was administratively located in the Puck County in the Pomeranian Voivodeship of the Polish Crown until the Partitions of Poland. It remained a church village of the Cistercians from Oliwa, while the present-day district of Zagórze was a royal village of the Polish Crown, and also new craft settlements (also present-day districts) Szmelta and Stara Piła emerged.