--- /usr/src/etc/rc.d/ntpd	2016-02-14 15:12:53.481581637 -0800
+++ /etc/rc.d/ntpd	2016-05-23 13:41:33.381706000 -0700
@@ -99,16 +99,16 @@
 		$verbose not replacing $ntp_db_leapfile with $ntp_src_leapfile 
 	fi
 	ntp_leap_expiry=$(get_ntp_leapfile_expiry $ntp_db_leapfile)
 	ntp_leapfile_expiry_seconds=$((ntp_leapfile_expiry_days*86400))
 	ntp_leap_fetch_date=$((ntp_leap_expiry-ntp_leapfile_expiry_seconds))
 	if [ $(current_ntp_ts) -ge $ntp_leap_fetch_date ]; then
 		$verbose Within ntp leapfile expiry limit, initiating fetch
 		for url in $ntp_leapfile_sources ; do
 			$verbose fetching $url
 			fetch $ntp_leapfile_fetch_opts -o $ntp_tmp_leapfile $url && break
 		done
-		ntp_ver_no_tmp=$(get_ntp_leapfile_ver $ntp_tmp_leapfile)
-		if [ "$ntp_ver_no_tmp" -gt "$ntp_ver_no_db" ]; then
+		ntp_expiry_tmp=$(get_ntp_leapfile_expiry $ntp_tmp_leapfile)
+		if [ "$ntp_expiry_tmp" -gt "$ntp_leap_expiry" ]; then
 			$verbose using $url as $ntp_db_leapfile
 			mv $ntp_tmp_leapfile $ntp_db_leapfile
 		else