diff -Nru net-retriever-1.18ubuntu2/debian/changelog net-retriever-1.18ubuntu3/debian/changelog
--- net-retriever-1.18ubuntu2/debian/changelog	2008-02-08 07:25:39.000000000 -0800
+++ net-retriever-1.18ubuntu3/debian/changelog	2008-02-12 06:40:44.000000000 -0800
@@ -1,3 +1,11 @@
+net-retriever (1.18ubuntu3) hardy; urgency=low
+
+  * Enable net-retriever to pull down udebs from universe and multiverse 
+    if mirror/{universe,multiverse} are respectively set per the online 
+    documentation.
+
+ -- Matt T. Proud <mtp@google.com>  Tue, 12 Feb 2008 06:38:41 -0800
+
 net-retriever (1.18ubuntu2) hardy; urgency=low
 
   * Add Vcs-Bzr for Ubuntu.
diff -Nru /tmp/EOes3kZhd4/net-retriever-1.18ubuntu2/net-retriever /tmp/S1Kz0Rcm27/net-retriever-1.18ubuntu3/net-retriever
--- net-retriever-1.18ubuntu2/net-retriever	2008-01-29 08:47:43.000000000 -0800
+++ net-retriever-1.18ubuntu3/net-retriever	2008-02-12 06:37:34.000000000 -0800
@@ -179,11 +179,22 @@
 	if [ -z "$components" ]; then
 		error "No components listed in $Release."
 	fi
+
+	db_get mirror/universe
+	allow_universe="$RET"
+
+	db_get mirror/multiverse
+	allow_multiverse="$RET"
+
 	for comp in $components; do
 		# TODO: Ubuntu-specific hack to avoid pulling in
 		# udebs from unsupported components; is there any
 		# way to make this more generic?
-		if [ "$comp" != main ] && [ "$comp" != restricted ]; then
+		if [ "$comp" = "universe" ] && [ "$allow_universe" != "true" ];
+		then
+			continue
+		elif [ "$comp" = "multiverse" ] && \
+			[ "$allow_multiverse" != "true" ]; then
 			continue
 		fi
 		for ext in '.gz' ''; do