Just upgraded to the 4S and the other night I went through all my photos on iPhoto that weren't located on the Places map (things which weren't taken on my iPhone) and it duly updated the map on my iPhone. Now I have the 4S though, the Places map only has the pictures on it that are in my Camera Roll, none from my albums.

Any idea why and how it can be fixed?

Thanks in advance.