diff --git a/Makefile b/Makefile
index 7b7d5ab7..d6d0c20d 100755
--- a/Makefile
+++ b/Makefile
@@ -1020,6 +1020,24 @@ conf:
 mirrorcheck: ok apt-update
 	$(Q)$(apt) cache dumpavail | $(mirrorcheck)
 
+update-popcon: tasks/popularity-contest-$(CODENAME)
+tasks/popularity-contest-$(CODENAME):
+	rm -f popcon-inst
+	( \
+		echo '/*' ; \
+		echo '   Popularity Contest results' ; \
+		echo '   See the README for details on updating.' ; \
+		echo '' ; \
+		echo '   Last update: $$Date$$' ; \
+		echo '*/' ; \
+		echo '' ; \
+	) > $@
+	wget --output-document popcon-inst \
+		http://popcon.debian.org/main/by_inst \
+		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}' >> $@
+
 # Little trick to simplify things
 official_images: bin-official_images src-official_images
 bin-official_images: ok bootable upgrade bin-images
diff --git a/debian/changelog b/debian/changelog
index a3b95277..59881d70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ debian-cd (2.2.18) UNRELEASED; urgency=low
     - Add usbutils to netinst cds, it'll be installed by a future version
       of hw-detect.
     - Add tools/get_diskusage.pl (originally by Petter).
+    - Add update-popcon Makefile target (taken from Skolelinux).
   * Petter Reinholdtsen
     - Regenereated tasks/popularity-contest-sarge based on the current data.
     - Avoid kernel versions 2.4.24 and 2.6.3 on the first i386 CD, as we