The visit was part of a tour of the UK – the first by a reigning Pope - that saw him visit nine cities and deliver 16 major addresses.
He started his visit in England and flew north of the border from RAF Leeming, in Yorkshire, from where he travelled by jet to RAF Turnhouse – now Edinburgh Airport – on May 31.
Murrayfield Stadium was his first port of call, where he met with around 45,000 young people and Protestant church leaders, before visiting the Capital’s Catholic cathedral.
The next day, June 1, saw John Paul II visit patients at St Joseph's Hospital in Rosewell, address teachers at St Andrew's College, and celebrate Mass with a huge crowd of around 300,000 people at Glasgow’s Bellahouston Park.
During the service, the Pope was presented with a number of gifts including a pipe banner with the Pope's coat of arms, a piece of Caithness glass, whisky and a Scotland football top.
Here are 26 pictures to take you back to those two memorable days.
Read more:
Murrayfield Stadium was his first port of call, where he met with around 45,000 young people and Protestant church leaders, before visiting the Capital’s Catholic cathedral.
5. Reach out
Well-wishers stretch out to touch Pope John Paul II at St Joseph's Hospital, in Rosewell. Photo: Unknown
6. Assembling
Pope John Paul II meets with Right reverend John McIntyre, Moderator of the General Assembly of the Church of Scotland, in the courtyard of the Assembly Hall, in Edinburgh. Photo: Unknown
7. Papal service
Pope John Paul II in St Mary's Cathedral, in Edinburgh, during the Papal visit to Scotland. Photo: Allan Milligan
8. Procession
The Popemobile carrying Pope John Paul II makes its way down the Mound from the Assembly Hall. Photo: Allan Milligan