Add watchdog, rpm-8660, and rpm