Fix package list name to enable build
Fix part 2
Merge branch 'master' of https://github.com/65b/s100