+ Partial merge with Debian package