Add patch from kojiro to support keyword removal and all
drwxr-xr-x - trunk