You have to change your visa into the new passport at the immigration. The same time you can make a re- entry stamp. Before the yearly extension of the non-o you have to change it anyway.
I took a normal retired visa and the got the re-entry stamp before I left. No need for a multiple entry visa, only question of money. This is for Swiss.