diff --git a/ChangeLog b/ChangeLog
index 5eddd1bd..b594b1b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-25  Benoît Dejean  <TazForEver@dlfp.org>
+
+	* lib/error.c: (glibtop_error_io_vr), (glibtop_warn_io_vr):
+	s/strerror/g_strerror.
+
 2005-03-11  Benoît Dejean  <TazForEver@dlfp.org>
 
 	* configure.in: Post release version bump.
diff --git a/lib/error.c b/lib/error.c
index 93585fdc..a2b9ccbb 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -23,8 +23,13 @@
    Boston, MA 02111-1307, USA.
 */
 
+#include <config.h>
+
 #include <glibtop/error.h>
 
+#include <glib/gstrfuncs.h>
+#include <errno.h>
+
 #define DEFAULT_NAME	"LibGTop-Server"
 
 /* Prints error message and exits. */
@@ -56,7 +61,7 @@ glibtop_error_io_vr (glibtop_server *server, char *format, int error, va_list ar
 {
     print_server_name (server);
     vfprintf (stderr, format, args);
-    fprintf (stderr, ": %s\n", strerror (error));
+    fprintf (stderr, ": %s\n", g_strerror (error));
 
 #ifdef LIBGTOP_ENABLE_DEBUG
     abort ();
@@ -82,7 +87,7 @@ glibtop_warn_io_vr (glibtop_server *server, char *format, int error, va_list arg
 {
     print_server_name (server);
     vfprintf (stderr, format, args);
-    fprintf (stderr, ": %s\n", strerror (error));
+    fprintf (stderr, ": %s\n", g_strerror (error));
 
 #ifdef LIBGTOP_FATAL_WARNINGS
     abort ();