I’m starting to write a detailed description about how we’ll tackle the leap second. In the meanwhile you can well read this very beautiful and informative piece by Miroslav Lichvar. His observations about the behaviour of ntpd match mine and will give you an idea of how our solution works.