Enable support for RFC3581 (bug #1862)