diff --git a/ChangeLog b/ChangeLog
index 543b60376..3bad73d32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-25  Tomas Frydrych  <tf@openedhand.com>
+
+	* clutter/clutter-texture.c:
+	(texture_update_data):
+	Set alignment based on actual data rowstride, not the texture
+	width.
+
 2008-02-21  Tomas Frydrych  <tf@openedhand.com>
 
 	* clutter/x11/clutter-backend-x11.h:
diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c
index fc28e9607..30b7d594e 100644
--- a/clutter/clutter-texture.c
+++ b/clutter/clutter-texture.c
@@ -1213,8 +1213,8 @@ texture_get_tile_pixbuf (ClutterTexture *texture,
       tex_width = priv->x_tiles[ix].size;
       tex_height = priv->y_tiles[iy].size;
     }
-  
-  /* Make sure if we aren't using rectangular textures that we increase the 
+
+  /* Make sure if we aren't using rectangular textures that we increase the
    * texture size accordingly.
    */
   if (priv->target_type == CGL_TEXTURE_2D) /* POT */
@@ -1989,7 +1989,7 @@ texture_update_data (ClutterTexture *texture,
       CLUTTER_NOTE (TEXTURE, "syncing for single tile");
 
       cogl_texture_bind (priv->target_type, priv->tiles[0]);
-      cogl_texture_set_alignment (priv->target_type, 4, priv->width);
+      cogl_texture_set_alignment (priv->target_type, 4, rowstride/4);
 
       cogl_texture_set_filters
 	(priv->target_type,