#381036 pdebuild, add missing features of normal debuild