diff --git a/debian/bind9.named.service b/debian/bind9.named.service
index 8bf065397cb0c178b3dd9415d85cab424143a387..06db299c4e8d49b338ad75dd90412e70ad3aa7e3 100644
--- a/debian/bind9.named.service
+++ b/debian/bind9.named.service
@@ -6,8 +6,9 @@ Wants=nss-lookup.target
 Before=nss-lookup.target
 
 [Service]
+Type=forking
 EnvironmentFile=-/etc/default/named
-ExecStart=/usr/sbin/named -f $OPTIONS
+ExecStart=/usr/sbin/named $OPTIONS
 ExecReload=/usr/sbin/rndc reload
 ExecStop=/usr/sbin/rndc stop
 Restart=on-failure
diff --git a/debian/changelog b/debian/changelog
index 3466f1bf97bc886df2dcc57daaeaf474ab05f84c..ef532e84e91397b79491c95a0da2c759502fd99e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+bind9 (1:9.16.18-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * d/bind9.named.service: use systemd Type=forking to signal daemon init. This
+    fixes a regression of #900788 where services whose startup depend on name
+    resolutions may fail due to bind9 not being ready (LP: #1899902).
+
+ -- Athos Ribeiro <athos.ribeiro@canonical.com>  Fri, 18 Jun 2021 11:03:40 -0300
+
 bind9 (1:9.16.18-1) unstable; urgency=medium
 
   * New upstream version 9.16.18