makeahpkg: sync with habs