PR: 7947 Submitted by: maintainer
get it to compile on -current. Will fix later. PR: 3765 Submitted by: Andrey Zakhvatov <andy@icc.surw.chel.su>