diff --git a/ChangeLog b/ChangeLog
index bf5b4ca98b..08c515168c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-25  Michael Smith <msmith@songbirdnest.com>
+
+	Patch by Edward Hervey <edward.hervey@collabora.co.uk>
+	* tools/gst-run.c:
+	  Include <unistd.h> conditionally on HAVE_UNISTD_H as elsewhere.
+
 2008-04-25  Wim Taymans  <wim.taymans@collabora.co.uk>
 
 	* gst/gstbin.c: (gst_bin_class_init), (gst_bin_init),
diff --git a/tools/gst-run.c b/tools/gst-run.c
index 4c6dee35b6..ac6e64af2a 100644
--- a/tools/gst-run.c
+++ b/tools/gst-run.c
@@ -25,7 +25,9 @@
 
 #include <stdlib.h>
 #include <string.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <errno.h>
 #include <glib.h>