diff --git a/debian/changelog b/debian/changelog
index f94b459ed..684bf022c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ grub2 (2.00-1) UNRELEASED; urgency=low
   * Add per-platform *-dbg packages containing files needed to use GRUB's
     GDB stub.  These are relatively large and thus worth splitting out.
   * Build-depend on ttf-dejavu-core for the starfield theme.
+  * Add a grub-theme-starfield package containing the starfield theme.
 
  -- Christian Perrier <bubulle@debian.org>  Sat, 02 Jun 2012 19:51:35 +0200
 
diff --git a/debian/control b/debian/control
index 3a6c92a6f..48cca1863 100644
--- a/debian/control
+++ b/debian/control
@@ -488,6 +488,13 @@ Description: GRand Unified Bootloader, version 2 (Yeeloong version)
  This package contains a version of GRUB that has been built for use with
  the Lemote Yeeloong laptop.
 
+Package: grub-theme-starfield
+Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-sparc any-mipsel any-ia64
+Depends: ${misc:Depends}, grub-common (= ${binary:Version})
+Multi-Arch: foreign
+Description: GRand Unified Bootloader, version 2 (starfield theme)
+ This is the default theme for GRUB's graphical menu.
+
 Package: grub-mount-udeb
 XC-Package-Type: udeb
 Section: debian-installer
diff --git a/debian/grub-common.install.in b/debian/grub-common.install.in
index 907fb79bc..d2efc366d 100644
--- a/debian/grub-common.install.in
+++ b/debian/grub-common.install.in
@@ -18,7 +18,9 @@ usr/bin/grub-script-check
 usr/sbin/grub-mkconfig
 usr/sbin/grub-mkdevicemap
 usr/sbin/grub-probe
-usr/share/grub
+usr/share/grub/*.h
+usr/share/grub/*.pf2
+usr/share/grub/grub-mkconfig_lib
 usr/share/locale
 usr/share/man/man1/grub-editenv.1
 usr/share/man/man1/grub-fstest.1
diff --git a/debian/grub-theme-starfield.install b/debian/grub-theme-starfield.install
new file mode 100644
index 000000000..05013a9ce
--- /dev/null
+++ b/debian/grub-theme-starfield.install
@@ -0,0 +1 @@
+usr/share/grub/themes/starfield
diff --git a/debian/rules b/debian/rules
index 0fe1f2b29..0da55f6d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -262,7 +262,7 @@ install/grub-common:
 
 override_dh_install:
 	dh_install -pgrub2 -pgrub-linuxbios -pgrub-efi -pgrub-rescue-pc -pgrub-firmware-qemu
-	set -e; for package in grub-common grub2-common grub-mount-udeb; do \
+	set -e; for package in grub-common grub2-common grub-theme-starfield grub-mount-udeb; do \
 		dh_install -p$$package --sourcedir=debian/tmp-grub-$(COMMON_PLATFORM); \
 	done
 	rm -f debian/grub2-common/usr/share/info/dir*