diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 1cea2c3d7..47a2b2047 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -156,6 +156,7 @@ class Gencontrol(Base):
             image = self.templates["control.image.type-standalone"]
             build_modules = False
         elif config_entry_image['type'] == 'plain-xen':
+            raise RuntimeError
             image = self.templates["control.image.type-modulesextra"]
             build_modules = True
             config_entry_xen = self.config.merge('xen', arch, featureset, flavour)
@@ -175,6 +176,15 @@ class Gencontrol(Base):
             image = self.templates["control.image.type-%s" % config_entry_image['type']]
             #image = self.templates["control.image.type-modulesinline"]
 
+        config_entry_xen = self.config.merge('xen', arch, featureset, flavour)
+        if config_entry_xen.get('dom0-support', False):
+            p = self.process_packages(self.templates['control.xen-linux-system'], vars)
+            l = PackageRelationGroup()
+            for xen_flavour in config_entry_xen['flavours']:
+                l.append("xen-hypervisor-%s" % xen_flavour)
+            p[0]['Depends'].append(l)
+            packages_dummy.extend(p)
+
         vars.setdefault('desc', None)
 
         packages_own.append(self.process_real_image(image[0], image_fields, vars))
diff --git a/debian/templates/control.xen-linux-system.in b/debian/templates/control.xen-linux-system.in
index b3840a653..afebaf737 100644
--- a/debian/templates/control.xen-linux-system.in
+++ b/debian/templates/control.xen-linux-system.in
@@ -1,5 +1,5 @@
 Package: xen-linux-system-@upstreamversion@@abiname@@localversion@
 Depends: linux-image-@upstreamversion@@abiname@@localversion@ (= ${binary:Version})
-Description: XEN system with Linux @upstreamversion@ image on @class@
+Description: Xen system with Linux @upstreamversion@ on @class@
  This package depends on the binary Linux image and hypervisors.