keep up with sipsup-dopdep branch