diff --git a/debian/changelog b/debian/changelog
index ea14bed7..5877082d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.39) oneiric; urgency=low
+
+  * Explicitely select the oem-config frontend to install on a
+    per-project basis, to match the ubiquity in use (LP: #820514)
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 26 Sep 2011 19:14:56 -0600
+
 livecd-rootfs (2.38) oneiric; urgency=low
 
   * Add main, restricted, universe, and multiverse to the sources.list
diff --git a/live-build/auto/config b/live-build/auto/config
index 77c4b2ae..d5d37c98 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -77,7 +77,17 @@ case $IMAGEFORMAT in
 				COMPONENTS='main restricted universe multiverse'
 				;;
 			*)
-				add_package live jasper
+				case $PROJECT in
+					kubuntu*)
+						add_package live jasper oem-config-kde
+						;;
+					ubuntu-server)
+						add_package live jasper oem-config-debconf
+						;;
+					*)
+						add_package live jasper oem-config-gtk
+						;;
+				esac
 				;;
 		esac
 		;;