Update with content from releng's paper