This also cleans up the Makefile and removes an unneeded patch. Signed-off-by: Jan Hoffmann <jan@3e8.eu>