sync from gnu savannah