Add new option --with-keygrip