Rename -Y to -@ and add patch for less-460