diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index a759689b44..912af96ee6 100644
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -534,7 +534,6 @@ static QEMUMachine integratorcp_machine = {
     .name = "integratorcp",
     .desc = "ARM Integrator/CP (ARM926EJ-S)",
     .init = integratorcp_init,
-    .is_default = 1,
 };
 
 static void integratorcp_machine_init(void)
diff --git a/vl.c b/vl.c
index 2355227bcb..9975e5a4e3 100644
--- a/vl.c
+++ b/vl.c
@@ -3929,7 +3929,8 @@ int main(int argc, char **argv, char **envp)
 #endif
 
     if (machine_class == NULL) {
-        fprintf(stderr, "No machine found.\n");
+        fprintf(stderr, "No machine specified, and there is no default.\n"
+                "Use -machine help to list supported machines!\n");
         exit(1);
     }