diff --git a/Makefile b/Makefile
index d6d0c20d..b92bf359 100755
--- a/Makefile
+++ b/Makefile
@@ -1037,6 +1037,7 @@ tasks/popularity-contest-$(CODENAME):
 		http://popcon.debian.org/contrib/by_inst
 	grep -h '^[^#]' popcon-inst | egrep -v '(Total|-----)' | \
 		sort -rn -k3,3 -k7,7 -k4,4 | awk '{print $$2}' >> $@
+	rm -f popcon-inst
 
 # Little trick to simplify things
 official_images: bin-official_images src-official_images
diff --git a/build.sh b/build.sh
index 9fe64bc6..7c4b2b89 100755
--- a/build.sh
+++ b/build.sh
@@ -11,6 +11,12 @@ if [ -n "$1" ] ; then
     export ARCH=$1
 fi
 
+cd tools 
+generate_di_list
+generate_di+k_list
+cd ..
+make update-popcon
+
 make distclean
 make ${CODENAME}_status
 if [ "$SKIPMIRRORCHECK" = "yes" ]; then
@@ -51,3 +57,5 @@ fi
 make "$IMAGETARGET"
 
 make imagesums
+
+tools/get_diskusage.pl