diff --git a/debian/changelog b/debian/changelog
index b0e6cc15..46d5404f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.632) UNRELEASED; urgency=medium
+
+  * Fix broken DNS in buildd image builds.
+
+ -- David Krauser <david.krauser@canonical.com>  Tue, 10 Dec 2019 15:28:12 -0400
+
 livecd-rootfs (2.631) focal; urgency=medium
 
   * Add support for uc20 model assertions.
diff --git a/live-build/buildd/hooks/49-policy-rc-d.binary b/live-build/buildd/hooks/48-policy-rc-d.binary
similarity index 100%
rename from live-build/buildd/hooks/49-policy-rc-d.binary
rename to live-build/buildd/hooks/48-policy-rc-d.binary
diff --git a/live-build/buildd/hooks/49-empty-resolv-conf.binary b/live-build/buildd/hooks/49-empty-resolv-conf.binary
new file mode 100755
index 00000000..df4a9b9a
--- /dev/null
+++ b/live-build/buildd/hooks/49-empty-resolv-conf.binary
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e
+
+chroot chroot truncate -s 0 /etc/resolv.conf
diff --git a/live-build/buildd/hooks/52-linux-virtual-image.binary b/live-build/buildd/hooks/52-linux-virtual-image.binary
index 000eebc1..f373136b 100755
--- a/live-build/buildd/hooks/52-linux-virtual-image.binary
+++ b/live-build/buildd/hooks/52-linux-virtual-image.binary
@@ -27,10 +27,6 @@ cleanup_linux_virtual() {
 }
 trap cleanup_linux_virtual EXIT
 
-# The base buildd chroot includes an empty resolv.conf
-# We don't want to include that in the bootable images
-rm $mount_d/etc/resolv.conf
-
 # Install dependencies
 env DEBIAN_FRONTEND=noninteractive chroot "$mount_d" apt-get \
     update --assume-yes
diff --git a/live-build/buildd/includes.chroot/etc/resolv.conf b/live-build/buildd/includes.chroot/etc/resolv.conf
deleted file mode 100644
index e69de29b..00000000