diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f35ea6c..2f0b17a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,8 @@ The **patch** part changes incrementally at each release.
 
 ### Changed
 
+* ntpd: Add leapfile configuration setting to ntpd on debian 10+
+
 ### Fixed
 
 ### Removed
diff --git a/ntpd/templates/ntp.conf.j2 b/ntpd/templates/ntp.conf.j2
index e57dad33..d89a83ee 100644
--- a/ntpd/templates/ntp.conf.j2
+++ b/ntpd/templates/ntp.conf.j2
@@ -2,6 +2,11 @@
 
 driftfile /var/lib/ntp/ntp.drift
 
+{% if ansible_distribution_major_version is version('10', '>=') %}
+# Leap seconds definition provided by tzdata
+leapfile /usr/share/zoneinfo/leap-seconds.list
+{% endif %}
+
 # Enable this if you want statistics to be logged.
 #statsdir /var/log/ntpstats/