update config file to Havana

This comes from #49

Also fix for bnc#856276 from Roxy