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.
Read more here: In Pictures: Heads of State attend the funeral of Pope Francis in Rome as thousands gather
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.
9. Welcome to Scotland
Pope John Paul II is greeted by Archbishop Thomas Winning (later Cardinal Winning) when he lands at Turnhouse Airport. Cardinal Winning had played a major role in ensuring the Papal visit went ahead. Photo: Unknown
10. Tradition
Pope John Paul II does his traditional kissing of the tarmac when he lands at Turnhouse Airport as Cardinal Gray looks on. Photo: Denis Straughan
11. Full house
Pope John Paul II meets members of the Roman Catholic church at St Mary's Cathedral in Edinburgh. Photo: Alan Ledgerwood
12. Standing room only
Pope John Paul II addresses members of the Roman Catholic church at St Mary's Cathedral in Edinburgh. Photo: Alan Ledgerwood