Patches from Debian

Hi,

we applied these two patches. Please include them.