Some more stuff for CC-5356 / Ubuntu Saucy installation