Patch by Stefan Metzmacher <metze@metzemix.de>: