import our patches

- strict regex to distict different packages
- always use onstatus