Sync with RetroBSD tree: emg 1.6