Patch from Adrian Bunk <bunk@fs.tum.de>

It would be nice if everyone would try to compile the patched files
before submitting patches...