diff --git a/src/gallium/auxiliary/util/Makefile b/src/gallium/auxiliary/util/Makefile
index 003aa05cb9a..bc3571e6421 100644
--- a/src/gallium/auxiliary/util/Makefile
+++ b/src/gallium/auxiliary/util/Makefile
@@ -34,3 +34,6 @@ C_SOURCES = \
 	u_simple_screen.c
 
 include ../../Makefile.template
+
+u_format_table.c: u_format_table.py u_format.csv
+	python u_format_table.py u_format.csv > $@
diff --git a/src/gallium/auxiliary/util/u_format.csv b/src/gallium/auxiliary/util/u_format.csv
index bf8f6ada171..ab56b29a138 100644
--- a/src/gallium/auxiliary/util/u_format.csv
+++ b/src/gallium/auxiliary/util/u_format.csv
@@ -2,8 +2,8 @@ PIPE_FORMAT_A8R8G8B8_UNORM        , rgba, 1, 1, un8 , un8 , un8 , un8 , zyxw,
 PIPE_FORMAT_X8R8G8B8_UNORM        , rgba, 1, 1, un8 , un8 , un8 , un8 , zyx1, 
 PIPE_FORMAT_B8G8R8A8_UNORM        , rgba, 1, 1, un8 , un8 , un8 , un8 , xyzw, 
 PIPE_FORMAT_B8G8R8X8_UNORM        , rgba, 1, 1, un8 , un8 , un8 , un8 , xyz1, 
-PIPE_FORMAT_A1R5G5B5_UNORM        , rgba, 1, 1, un5 , un5 , un5 , un1 , wxyz, 
-PIPE_FORMAT_A4R4G4B4_UNORM        , rgba, 1, 1, un4 , un4 , un4 , un4 , wxyz, 
+PIPE_FORMAT_A1R5G5B5_UNORM        , rgba, 1, 1, un5 , un5 , un5 , un1 , zyxw, 
+PIPE_FORMAT_A4R4G4B4_UNORM        , rgba, 1, 1, un4 , un4 , un4 , un4 , zyxw, 
 PIPE_FORMAT_R5G6B5_UNORM          , rgba, 1, 1, un5 , un6 , un5 ,     , zyx1, 
 PIPE_FORMAT_A2B10G10R10_UNORM     , rgba, 1, 1, un10, un10, un10, un2 , wzyx, 
 PIPE_FORMAT_L8_UNORM              , rgba, 1, 1, un8 ,     ,     ,     , xxx1, 
diff --git a/src/gallium/auxiliary/util/u_format_table.c b/src/gallium/auxiliary/util/u_format_table.c
index 84e91b44ee8..ea19d2fb79b 100644
--- a/src/gallium/auxiliary/util/u_format_table.c
+++ b/src/gallium/auxiliary/util/u_format_table.c
@@ -120,10 +120,10 @@ util_format_description_table[] =
          {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 1} /* w */
       },
       {
-         UTIL_FORMAT_SWIZZLE_W, /* r */
-         UTIL_FORMAT_SWIZZLE_X, /* g */
-         UTIL_FORMAT_SWIZZLE_Y, /* b */
-         UTIL_FORMAT_SWIZZLE_Z /* a */
+         UTIL_FORMAT_SWIZZLE_Z, /* r */
+         UTIL_FORMAT_SWIZZLE_Y, /* g */
+         UTIL_FORMAT_SWIZZLE_X, /* b */
+         UTIL_FORMAT_SWIZZLE_W /* a */
       },
       UTIL_FORMAT_COLORSPACE_RGB,
    },
@@ -139,10 +139,10 @@ util_format_description_table[] =
          {UTIL_FORMAT_TYPE_UNSIGNED, TRUE, 4} /* w */
       },
       {
-         UTIL_FORMAT_SWIZZLE_W, /* r */
-         UTIL_FORMAT_SWIZZLE_X, /* g */
-         UTIL_FORMAT_SWIZZLE_Y, /* b */
-         UTIL_FORMAT_SWIZZLE_Z /* a */
+         UTIL_FORMAT_SWIZZLE_Z, /* r */
+         UTIL_FORMAT_SWIZZLE_Y, /* g */
+         UTIL_FORMAT_SWIZZLE_X, /* b */
+         UTIL_FORMAT_SWIZZLE_W /* a */
       },
       UTIL_FORMAT_COLORSPACE_RGB,
    },