diff --git a/ChangeLog b/ChangeLog
index eab7439187..276cfd0b2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep  9 09:42:00 EST 2008 Cole Robinson <crobinso@redhat.com>
+
+	* src/qemu_conf.c : fix a segfault if no qemu emulator is passed
+	  when defining a domain.
+
 Mon Sep  8 16:28:30 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
 	* configure.in libvirt.spec.in docs/*: preparing release of
diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index d742c320fc..23ef050e75 100644
--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
@@ -790,7 +790,7 @@ int qemudBuildCommandLine(virConnectPtr conn,
     if (!emulator)
         return -1;
 
-    ADD_ARG_LIT(vm->def->emulator);
+    ADD_ARG_LIT(emulator);
     ADD_ARG_LIT("-S");
     ADD_ARG_LIT("-M");
     ADD_ARG_LIT(vm->def->os.machine);