diff --git a/Makefile b/Makefile
index 875f16b7..aed0383a 100755
--- a/Makefile
+++ b/Makefile
@@ -225,7 +225,17 @@ $(ADIR)/status:
 		fi; \
 	done;
 	:> $(ADIR)/status
-    # Updating the apt database
+
+	# Set up keyring so apt doesn't complain
+	@echo "Setting up debian-archive-keyring"
+	$(Q)mkdir -p $(TDIR)/debian-archive-keyring
+	$(Q)dpkg -x $(MIRROR)/$(shell $(which_deb) $(MIRROR) $(CODENAME) debian-archive-keyring) $(TDIR)/debian-archive-keyring
+	$(Q)for ARCH in $(ARCHES); do \
+		mkdir -p $(ADIR)/$(CODENAME)-$$ARCH/apt/trusted.gpg.d; \
+		ln -s $(TDIR)/debian-archive-keyring/usr/share/keyrings/* $(ADIR)/$(CODENAME)-$$ARCH/apt/trusted.gpg.d; \
+	done
+
+	# Updating the apt database
 	$(Q)for ARCH in $(ARCHES); do \
 		export ARCH=$$ARCH; \
 		$(apt) update; \
diff --git a/debian/changelog b/debian/changelog
index 19192d1b..2e08f5d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,10 @@ debian-cd (3.1.12) UNRELEASED; urgency=low
     select a different desktop. Thanks to Rick Thomas for the
     text. Tweaked slightly to list the default on the current disc too.
 
+  [ Robert Spencer ]
+  * Extract debian-archive-keyring when setting up apt to avoid error
+    messages about missing keys. Closes: #703431
+
  -- Steve McIntyre <93sam@debian.org>  Wed, 26 Sep 2012 01:09:13 +0100
 
 debian-cd (3.1.11) unstable; urgency=low