Patch by Daniel Zimmermann <netzimme@aim.com>: