Update based on 2014/06/07 fresh install