diff --git a/ChangeLog b/ChangeLog
index 3d87f43f10..adc81aee86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 12 16:39:06 EDT 2009 Cole Robinson <crobinso@redhat.com>
+
+	* tests/eventtest.c: Use safewrite instead of write
+	* po/POTFILES.in: Add src/vbox/vbox_driver.c
+
 Tue May 12 16:25:59 EDT 2009 Cole Robinson <crobinso@redhat.com>
 
 	* src/storage_backend_fs.c: Break out FS volume build routines to
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 831f79669b..78f7cbcc34 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -38,6 +38,7 @@ src/uml_conf.c
 src/uml_driver.c
 src/util.c
 src/uuid.c
+src/vbox/vbox_driver.c
 src/vbox/vbox_tmpl.c
 src/virsh.c
 src/virterror.c
diff --git a/tests/eventtest.c b/tests/eventtest.c
index 4a6366e2b5..ff74b043e9 100644
--- a/tests/eventtest.c
+++ b/tests/eventtest.c
@@ -30,6 +30,7 @@
 #include "internal.h"
 #include "threads.h"
 #include "logging.h"
+#include "util.h"
 #include "../qemud/event.h"
 
 #define NUM_FDS 5
@@ -309,7 +310,7 @@ mymain(int argc, char **argv)
     /* First time, is easy - just try triggering one of our
      * registered handles */
     startJob("Simple write", &test);
-    ret = write(handles[1].pipeFD[1], &one, 1);
+    ret = safewrite(handles[1].pipeFD[1], &one, 1);
     if (finishJob(1, -1) != EXIT_SUCCESS)
         return EXIT_FAILURE;
 
@@ -319,7 +320,7 @@ mymain(int argc, char **argv)
      * try triggering another handle */
     virEventRemoveHandleImpl(handles[0].watch);
     startJob("Deleted before poll", &test);
-    ret = write(handles[1].pipeFD[1], &one, 1);
+    ret = safewrite(handles[1].pipeFD[1], &one, 1);
     if (finishJob(1, -1) != EXIT_SUCCESS)
         return EXIT_FAILURE;
 
@@ -346,13 +347,13 @@ mymain(int argc, char **argv)
 
     /* NB: this case is subject to a bit of a race condition.
      * Only 1 time in 3 does the 2nd write get triggered by
-     * before poll() exits for the first write(). We don't
+     * before poll() exits for the first safewrite(). We don't
      * see a hard failure in other cases, so nothing to worry
      * about */
     startJob("Deleted during dispatch", &test);
     handles[2].delete = handles[3].watch;
-    ret = write(handles[2].pipeFD[1], &one, 1);
-    ret = write(handles[3].pipeFD[1], &one, 1);
+    ret = safewrite(handles[2].pipeFD[1], &one, 1);
+    ret = safewrite(handles[3].pipeFD[1], &one, 1);
     if (finishJob(2, -1) != EXIT_SUCCESS)
         return EXIT_FAILURE;
 
@@ -361,7 +362,7 @@ mymain(int argc, char **argv)
     /* Extreme fun, lets delete ourselves during dispatch */
     startJob("Deleted during dispatch", &test);
     handles[2].delete = handles[2].watch;
-    ret = write(handles[2].pipeFD[1], &one, 1);
+    ret = safewrite(handles[2].pipeFD[1], &one, 1);
     if (finishJob(2, -1) != EXIT_SUCCESS)
         return EXIT_FAILURE;
 
@@ -410,7 +411,7 @@ mymain(int argc, char **argv)
 
     /* NB: this case is subject to a bit of a race condition.
      * Only 1 time in 3 does the 2nd write get triggered by
-     * before poll() exits for the first write(). We don't
+     * before poll() exits for the first safewrite(). We don't
      * see a hard failure in other cases, so nothing to worry
      * about */
     virEventUpdateTimeoutImpl(timers[2].timer, 100);