Remove already upstreamed patches, add another one from mailing-list. Signed-off-by: Michael Heimpold <mhei@heimpold.de>