Merge changes from Debian revision 3.0.6-4.