diff --git a/debian/changelog b/debian/changelog
index 2e568ea14..46eb681ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-build (1:20160105) UNRELEASED; urgency=medium
+
+  * Better handle empty package lists.
+
+ -- Raphaël Hertzog <hertzog@debian.org>  Tue, 05 Jan 2016 18:03:44 +0100
+
 live-build (1:20151215) unstable; urgency=medium
 
   * QA Upload.
diff --git a/scripts/build/binary_package-lists b/scripts/build/binary_package-lists
index d81bfe7d1..dcbadccb5 100755
--- a/scripts/build/binary_package-lists
+++ b/scripts/build/binary_package-lists
@@ -145,6 +145,10 @@ then
 
 	for SECTION in ${POOL}/*
 	do
+		if [ ! -d "${SECTION}" ]; then
+			break # Do nothing if the package lists were empty...
+		fi
+
 		SECTION="$(basename ${SECTION})"
 
 		mkdir -p ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}