diff --git a/legacy/ecore/ChangeLog b/legacy/ecore/ChangeLog
index e27c9c2899..bc11107f4a 100644
--- a/legacy/ecore/ChangeLog
+++ b/legacy/ecore/ChangeLog
@@ -956,3 +956,8 @@
        * Fix escaping in ecore_file_escape_name() to handle tab and
        newline right.
 
+2012-09-21  Carsten Haitzler (The Rasterman)
+
+       * Fix ecore_x_image_is_argb32_get() to return correctly on
+       endianess.
+
diff --git a/legacy/ecore/NEWS b/legacy/ecore/NEWS
index 7503e77950..be05e3dda8 100644
--- a/legacy/ecore/NEWS
+++ b/legacy/ecore/NEWS
@@ -23,6 +23,7 @@ Fixes:
        completion callback).
     * ecore_evas rotation handling on some driver implementations
     * ecore_file_escape_name() escape taba nd newline right.
+    * ecore_x_image_is_argb32_get() returns correctly given endianness.
 
 Improvements:
 
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_image.c b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_image.c
index 6789b94db2..8e221101b0 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_image.c
+++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_image.c
@@ -253,11 +253,9 @@ ecore_x_image_is_argb32_get(Ecore_X_Image *im)
        (vis->green_mask == 0x00ff00) && (vis->blue_mask == 0x0000ff))
      {
 #ifdef WORDS_BIGENDIAN
-        if (im->xim->byte_order == XCB_IMAGE_ORDER_LSB_FIRST)
-          return EINA_TRUE;
+        if (im->xim->byte_order == XCB_IMAGE_ORDER_MSB_FIRST) return EINA_TRUE;
 #else
-        if (im->xim->byte_order == XCB_IMAGE_ORDER_MSB_FIRST)
-          return EINA_TRUE;
+        if (im->xim->byte_order == XCB_IMAGE_ORDER_LSB_FIRST) return EINA_TRUE;
 #endif
      }
 
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c
index b8e720c447..71a933cc52 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c
@@ -338,9 +338,9 @@ ecore_x_image_is_argb32_get(Ecore_X_Image *im)
        (vis->blue_mask == 0x0000ff))
      {
 #ifdef WORDS_BIGENDIAN
-        if (im->xim->bitmap_bit_order == LSBFirst) return EINA_TRUE;
-#else
         if (im->xim->bitmap_bit_order == MSBFirst) return EINA_TRUE;
+#else
+        if (im->xim->bitmap_bit_order == LSBFirst) return EINA_TRUE;
 #endif
      }
    return EINA_FALSE;