diff -Nru /tmp/T0ka9eFeqG/base-config-2.44ubuntu21/apt-setup /tmp/Tt4IZALEhV/base-config-2.44ubuntu22/apt-setup
--- /tmp/T0ka9eFeqG/base-config-2.44ubuntu21/apt-setup	2004-09-15 07:13:02.000000000 +0100
+++ /tmp/Tt4IZALEhV/base-config-2.44ubuntu22/apt-setup	2004-09-27 13:31:25.000000000 +0100
@@ -725,15 +725,26 @@
 	echo "${SRCCOMMENT}deb-src $LINE" >> ${APTETC}sources.list
 fi
 
-if [ "$URI" = "cdrom" ] || [ "$URI" = "http" ] || [ "$URI" = "ftp" ] && ! grep -q 'universe' ${APTETC}sources.list; then
+if ([ "$URI" = "cdrom" ] || [ "$URI" = "http" ] || [ "$URI" = "ftp" ]) && ! grep -q 'universe' ${APTETC}sources.list; then
 	db_get apt-setup/universe
+	echo >> ${APTETC}sources.list
+	COMMENT=
 	if [ "$RET" = false ]; then
-		echo "" >> ${APTETC}sources.list
-		echo "## Uncomment the following two lines to fetch updated software from the network" >> ${APTETC}sources.list
-		echo "## and be able to use more than 12000 unsupported packages from the universe archive." >> ${APTETC}sources.list
-		echo "# deb http://$HOST$DIR $DIST main restricted universe" >> ${APTETC}sources.list
-		echo "# deb-src http://$HOST$DIR $DIST main restricted universe" >> ${APTETC}sources.list
+		cat <<EOF >> ${APTETC}sources.list
+## Uncomment the following two lines to add software from the 'universe'
+## repository.
+EOF
+		COMMENT="# "
 	fi
+	cat <<EOF >> ${APTETC}sources.list
+## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
+## team, and may not be under a free licence. Please satisfy yourself as to
+## your rights to use the software. Also, please note that software in
+## universe WILL NOT receive any review or updates from the Ubuntu security
+## team.
+${COMMENT}deb http://$HOST$DIR $DIST universe
+${COMMENT}deb-src http://$HOST$DIR $DIST universe
+EOF
 fi
 
 # Finally, see about adding a security.ubuntu.com entry. Deal with these
diff -Nru /tmp/T0ka9eFeqG/base-config-2.44ubuntu21/debian/changelog /tmp/Tt4IZALEhV/base-config-2.44ubuntu22/debian/changelog
--- /tmp/T0ka9eFeqG/base-config-2.44ubuntu21/debian/changelog	2004-09-22 19:20:30.000000000 +0100
+++ /tmp/Tt4IZALEhV/base-config-2.44ubuntu22/debian/changelog	2004-09-27 13:31:31.000000000 +0100
@@ -1,3 +1,13 @@
+base-config (2.44ubuntu22) warty; urgency=low
+
+  * Make warning about unsupportedness of 'universe' in
+    /etc/apt/sources.list scarier (closes: Ubuntu #1564).
+  * Remove 'main restricted' from the universe line, so people don't end up
+    with duplicate sources.list entries.
+  * Honour answer to apt-setup/universe question.
+
+ -- Colin Watson <cjwatson@canonical.com>  Mon, 27 Sep 2004 13:31:28 +0100
+
 base-config (2.44ubuntu21) warty; urgency=low
 
   * Drop ppp configuration question priority to medium.