diff --git a/lib/rapi/rlib1.py b/lib/rapi/rlib1.py
index 53dbfb3e0104c28a84d644a8327727aa773bcda9..7ca13b28f73a95fe3ad9ee0d7082e9fd5418b426 100644
--- a/lib/rapi/rlib1.py
+++ b/lib/rapi/rlib1.py
@@ -97,7 +97,7 @@ class R_info(baserlib.R_Generic):
         "64bit",
         "x86_64"
       ],
-      "hypervisor_type": "xen-3.0",
+      "hypervisor_type": "xen-pvm",
       "protocol_version": 12
     }
 
diff --git a/qa/qa-sample.json b/qa/qa-sample.json
index 1761b79b3e30d9dd58645111c56234d0face9097..9b323cd67d70d8dfe139de9bfe1012204087ba8a 100644
--- a/qa/qa-sample.json
+++ b/qa/qa-sample.json
@@ -1,7 +1,7 @@
 {
   "name": "xen-test",
   "rename": "xen-test-rename",
-  "hypervisor-type": "xen-3.0",
+  "hypervisor-type": "xen-pvm",
 
   "os": "debian-etch",
   "os-size": "10G",
diff --git a/scripts/gnt-cluster b/scripts/gnt-cluster
index 02019c07422ce6e5f0d842f7f765065b61a0e04d..fbc8cbf5fc6775c3bcafee4e7c62deff59892e6b 100755
--- a/scripts/gnt-cluster
+++ b/scripts/gnt-cluster
@@ -360,12 +360,12 @@ commands = {
                         metavar="ADDRESS", default=None),
             make_option("-t", "--hypervisor-type", dest="hypervisor_type",
                         help="Specify the hypervisor type "
-                        "(xen-3.0, kvm, fake, xen-hvm-3.1)",
-                        metavar="TYPE", choices=["xen-3.0",
+                        "(xen-pvm, kvm, fake, xen-hvm)",
+                        metavar="TYPE", choices=["xen-pvm",
                                                  "kvm",
                                                  "fake",
-                                                 "xen-hvm-3.1"],
-                        default="xen-3.0",),
+                                                 "xen-hvm"],
+                        default="xen-pvm",),
             make_option("-m", "--mac-prefix", dest="mac_prefix",
                         help="Specify the mac prefix for the instance IP"
                         " addresses, in the format XX:XX:XX",