Add support for portable mode (bug 236)