Bug#871698: upstream patch

[Sam Hartman]

I think that until the upstream release we could just increase the
length and get a fair distance.