Merge with git://charm.itp.tuwien.ac.at/mattems/klibc/.git#maks