diff --git a/debian/changelog b/debian/changelog
index fea99ec90..7e1b9e276 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ linux (3.10-1~exp1) UNRELEASED; urgency=low
     no longer have false positives
   * debian/patches: Reorder and group patches in series
   * debian/rules.real: Remove support for pre-multiarch dpkg
+  * Update policy version to 3.9.4
+    - debian/control: Put xen-linux-system-* in the 'metapackages' section
 
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 01 Jul 2013 00:58:08 +0100
 
diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in
index aa8a24011..ba123f081 100644
--- a/debian/templates/control.source.in
+++ b/debian/templates/control.source.in
@@ -2,7 +2,7 @@ Section: kernel
 Priority: optional
 Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
 Uploaders: Bastian Blank <waldi@debian.org>, Frederik Schüler <fs@debian.org>, maximilian attems <maks@debian.org>, Ben Hutchings <ben@decadent.org.uk>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Build-Depends: debhelper (>> 7), cpio, kmod | module-init-tools, python (>= 2.7), lzma [armel], kernel-wedge (>= 2.84), quilt, patchutils, bc
 Build-Depends-Indep: bzip2, xmlto
 Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/trunk/linux/
diff --git a/debian/templates/control.xen-linux-system.in b/debian/templates/control.xen-linux-system.in
index 8b5ffb561..d60a2ee11 100644
--- a/debian/templates/control.xen-linux-system.in
+++ b/debian/templates/control.xen-linux-system.in
@@ -1,4 +1,5 @@
 Package: xen-linux-system-@abiname@@localversion@
+Section: metapackages
 Depends: linux-image-@abiname@@localversion@ (= ${binary:Version}), ${misc:Depends}
 Description: Xen system with Linux @upstreamversion@ on @class@ (meta-package)
  This package depends on the binary Linux image and hypervisors.