Merge pull request #1275 from ranma42/fix-lib64