diff -Nru libvirt-0.8.3/debian/changelog libvirt-0.8.3/debian/changelog
--- libvirt-0.8.3/debian/changelog	2010-08-16 17:06:29.000000000 -0500
+++ libvirt-0.8.3/debian/changelog	2010-08-19 11:34:26.000000000 -0500
@@ -1,3 +1,10 @@
+libvirt (0.8.3-1ubuntu5) lucid; urgency=low
+
+  * Make sure that there is a hostname for libvirt to
+    resolve before starting libvirt.  (LP: #599342)
+
+ -- Serge Hallyn <serge.hallyn@canonical.com>  Thu, 19 Aug 2010 11:33:47 -0500
+
 libvirt (0.8.3-1ubuntu4) maverick; urgency=low
 
   * debian/patches/9012-apparmor-dont-ignore-open.patch: don't bother with
diff -Nru libvirt-0.8.3/debian/libvirt-bin.upstart libvirt-0.8.3/debian/libvirt-bin.upstart
--- libvirt-0.8.3/debian/libvirt-bin.upstart	2010-08-11 16:54:04.000000000 -0500
+++ libvirt-0.8.3/debian/libvirt-bin.upstart	2010-08-19 11:33:32.000000000 -0500
@@ -8,6 +8,15 @@
 respawn
 
 pre-start script
+	hostname=$(hostname)
+	grep "\<$hostname\>" /etc/hosts > /dev/null
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		until host $hostname
+		do
+			sleep 2s
+		done
+	fi
 	mkdir -p /var/run/libvirt
 	# Clean up a pidfile that might be left around
 	rm -f /var/run/libvirtd.pid