Apply patches proposed by Hilko Bengen from Debian