temp-patch: add -t and -m opts