Bug #2879: fix for repackaging