diff --git a/ChangeLog b/ChangeLog
index 00301c2262..03ff2677b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jan 29 12:44:15 CET 2009 Guido Günther <agx@sigxcpu.org>
+
+	* src/virsh.c (main): don't abort when setlocale() fails
+
 Wed Jan 28 22:05:11 GMT 2009 Daniel P.Berrange <berrange@redhat.com>
 
 	* src/remote_internal.c: Fix typo, and tweak variable decl
diff --git a/src/virsh.c b/src/virsh.c
index fd23e9ff8e..e24a154a16 100644
--- a/src/virsh.c
+++ b/src/virsh.c
@@ -7001,7 +7001,7 @@ main(int argc, char **argv)
 
     if (!setlocale(LC_ALL, "")) {
         perror("setlocale");
-        return -1;
+        /* failure to setup locale is not fatal */
     }
     if (!bindtextdomain(GETTEXT_PACKAGE, LOCALEBASEDIR)) {
         perror("bindtextdomain");