Upstream berskfile support

I will have a look at it today.