diff --git a/ChangeLog b/ChangeLog
index d9fa73ac9e..e201927e28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-12  David Schleef  <ds@schleef.org>
+
+	* gst/gstplugin.c:
+	  Using sigaction should depend on HAVE_SIGACTION, not HAVE_WIN32.
+	  Switch to using g_stat() because it's more portable.
+
 2007-05-12  David Schleef  <ds@schleef.org>
 
 	* gst/gst.c:
diff --git a/gst/gstplugin.c b/gst/gstplugin.c
index d537b03da4..3d188a339f 100644
--- a/gst/gstplugin.c
+++ b/gst/gstplugin.c
@@ -51,8 +51,8 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <glib/gstdio.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #ifdef HAVE_DIRENT_H
 #include <dirent.h>
 #endif
@@ -269,7 +269,7 @@ gst_plugin_register_func (GstPlugin * plugin, GModule * module,
   return plugin;
 }
 
-#ifndef HAVE_WIN32
+#ifdef HAVE_SIGACTION
 static struct sigaction oldaction;
 
 /*
@@ -399,7 +399,7 @@ gst_plugin_load_file (const gchar * filename, GError ** error)
     goto return_error;
   }
 
-  if (stat (filename, &file_status)) {
+  if (g_stat (filename, &file_status)) {
     GST_CAT_DEBUG (GST_CAT_PLUGIN_LOADING, "problem accessing file");
     g_set_error (error,
         GST_PLUGIN_ERROR,