The Scottish National Party has voted overwhelmingly in favour of a smoking ban in public places.
The motion won majority support at the conference
SNP delegates at the party's annual conference in Inverness supported a motion to put a stop to smoking in enclosed public spaces.
The motion by MSP Stewart Maxwell read: "Smokers do not have the right to damage the health of non-smokers."
There was some opposition but the majority of members agreed to pass the measure to protect Scotland's health.
MSP Sandra White, who smokes, disagreed and said the party of independence should not be restricting personal freedoms.
The Scottish Executive has insisted action must be taken to clamp down on smoking, which is killing thousands of people in Scotland each year.
The government has launched a public consultation on the issue which is due to run until the end of September.
More than 27,000 people have responded to survey on smoking in public places in Scotland - 20 times more responses than received by any other consultation.