diff --git a/ChangeLog b/ChangeLog
index c97698449..1116d25ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,15 @@
+2002-06-26  David Turner
+
+        * src/truetype/ttgload.c (TT_Load_Composite_Glyph),
+        src/base/ftoutln.c (FT_Vector_Transform): fixed Werner's latest
+        fix. FT_Vector_Transform wasn't buggy, the TrueType composite loader
+        was...
+
 2002-06-24  Werner Lemberg  <wl@gnu.org>
 
 	* include/freetype/freetype.h (FREETYPE_PATCH): Set to 3.
 
+
 2002-06-21  David Turner  <david@freetype.org>
 
 
diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c
index cbf2e0f24..f9a806ff6 100644
--- a/src/base/ftoutln.c
+++ b/src/base/ftoutln.c
@@ -628,9 +628,9 @@
       return;
 
     xz = FT_MulFix( vector->x, matrix->xx ) +
-         FT_MulFix( vector->y, matrix->yx );
+         FT_MulFix( vector->y, matrix->xy );
 
-    yz = FT_MulFix( vector->x, matrix->xy ) +
+    yz = FT_MulFix( vector->x, matrix->yx ) +
          FT_MulFix( vector->y, matrix->yy );
 
     vector->x = xz;
diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
index 8cb80ac7b..c1385fd53 100644
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -544,8 +544,8 @@
       else if ( subglyph->flags & WE_HAVE_A_2X2 )
       {
         xx = (FT_Fixed)FT_GET_SHORT() << 2;
-        xy = (FT_Fixed)FT_GET_SHORT() << 2;
         yx = (FT_Fixed)FT_GET_SHORT() << 2;
+        xy = (FT_Fixed)FT_GET_SHORT() << 2;
         yy = (FT_Fixed)FT_GET_SHORT() << 2;
       }