diff --git a/ChangeLog b/ChangeLog
index 021492a8b..86001010c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-10  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/giochannel.c (g_io_channle_set_encoding): Fix confusing
+	error message.  (#521028, Peter Kjellerstedt)
+
 2008-03-10  Matthias Clasen  <mclasen@redhat.com>
 
 	* tests/testglib.c: Still set the udddocs and uddpubshare 
diff --git a/glib/giochannel.c b/glib/giochannel.c
index 44289b6b1..3ef94e4ca 100644
--- a/glib/giochannel.c
+++ b/glib/giochannel.c
@@ -1127,8 +1127,8 @@ g_io_channel_set_encoding (GIOChannel	*channel,
           if (read_cd == (GIConv) -1)
             {
               err = errno;
-              from_enc = "UTF-8";
-              to_enc = encoding;
+              from_enc = encoding;
+              to_enc = "UTF-8";
             }
         }
       else
@@ -1141,8 +1141,8 @@ g_io_channel_set_encoding (GIOChannel	*channel,
           if (write_cd == (GIConv) -1)
             {
               err = errno;
-              from_enc = encoding;
-              to_enc = "UTF-8";
+              from_enc = "UTF-8";
+              to_enc = encoding;
             }
         }
       else