diff --git a/debian/changelog b/debian/changelog
index bcfaf325..35ecfd88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+livecd-rootfs (2.97) UNRELEASED; urgency=low
+
+  * add linux-firmware-nexus7 and nvidia-graphics-drivers-tegra3 to nexus7
+    builds
+  * preseed the license popup of linux-firmware-nexus7, we will show
+    it in the installer for full image installs.
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Mon, 19 Nov 2012 12:58:36 +0100
+
 livecd-rootfs (2.96) raring; urgency=low
 
   * add nexus7 specific kernel cmdline
diff --git a/live-build/auto/config b/live-build/auto/config
index 637dd95c..b6c2b039 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -308,9 +308,11 @@ case $ARCH in
 				;;
 			nexus7)
 				COMPONENTS='main restricted universe multiverse'
-				add_package install zram-config
+				add_package install zram-config linux-firmware-nexus7 nvidia-graphics-drivers-tegra3
 				add_package live ac100-tarball-installer
 				BINARY_REMOVE_LINUX=false
+				mkdir -p config/preseed
+				echo "linux-firmware-nexus7 shared/nexus7_notice_accepted boolean true" >config/preseed/linux-firmware-nexus7.preseed.chroot
 				;;
 		esac
 		;;