improve -of13 switching in distributions/base (BUG 802)