Sync changes from sparanoid.com