original diff from maintainer Thim Cederlund (thanks!) with tweaks by me (update plist and patches, removal of patch-Makefile)