prepare for reintroduction to Debian proper (hopefully)