diff --git a/debian/changelog b/debian/changelog
index 1a7eb6fb..78da5740 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 livecd-rootfs (2.208.4) UNRELEASED; urgency=medium
 
-  * Use the correct metapackage for edubuntu-desktop
-  * Hint pinentry-qt4 for kubuntu-desktop to avoid GNOME deps.
+  * Use the correct metapackage for edubuntu-desktop, and add HWE_HINTS
+  * Add KUBUNTU_HWE_HINTS and populate to work around task->meta change
 
  -- Adam Conrad <adconrad@ubuntu.com>  Wed, 04 Feb 2015 04:42:54 -0700
 
diff --git a/live-build/auto/config b/live-build/auto/config
index 965f3658..c830b368 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -195,6 +195,8 @@ esac
 HWE_X_PACKAGES="xserver-xorg-lts-utopic libegl1-mesa-drivers-lts-utopic xserver-xorg-video-all-lts-utopic"
 SIGNED_KERNEL_PACKAGE="linux-signed-generic-lts-utopic"
 UNITY_HWE_HINTS="unity-settings-daemon notify-osd libqt4-sql-sqlite unity"
+KUBUNTU_HWE_HINTS="pinentry-qt4"
+EDUBUNTU_HWE_HINTS="gnome-session gnome-terminal"
 
 case $PROJECT in
 	ubuntu|ubuntu-dvd)
@@ -234,7 +236,7 @@ case $PROJECT in
 					xserver-xorg-input-evdev-omap-revert 
 				;;
 			*)
-				add_package install kubuntu-desktop pinentry-qt4
+				add_package install kubuntu-desktop $KUBUNTU_HWE_HINTS
 				add_package install $HWE_X_PACKAGES
 				;;
 		esac
@@ -256,7 +258,7 @@ case $PROJECT in
 		;;
 
 	edubuntu|edubuntu-dvd)
-		add_package install ubuntu-minimal ubuntu-standard ubuntu-desktop edubuntu-desktop $UNITY_HWE_HINTS
+		add_package install ubuntu-minimal ubuntu-standard ubuntu-desktop edubuntu-desktop $UNITY_HWE_HINTS $EDUBUNTU_HWE_HINTS
 		add_package install $HWE_X_PACKAGES
 		LIVE_TASK='edubuntu-live'
 		LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'