diff --git a/ChangeLog b/ChangeLog
index 77d01acc7..15a025cb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-19  Werner Lemberg  <wl@gnu.org>
+
+	* src/sfnt/ttmtx.c (tt_face_get_metrics)
+	[!FT_CONFIG_OPTION_OLD_INTERNALS]: Another type-punning fix.
+
 2007-05-19  Derek Clegg  <dclegg@apple.com>
 
 	Savannah patch #5929.
diff --git a/src/sfnt/ttmtx.c b/src/sfnt/ttmtx.c
index 0289b85d8..286bd0c31 100644
--- a/src/sfnt/ttmtx.c
+++ b/src/sfnt/ttmtx.c
@@ -359,7 +359,10 @@
 
     if ( vertical )
     {
-      header     = (TT_HoriHeader*)&face->vertical;
+      void*  v = &face->vertical;
+
+
+      header     = (TT_HoriHeader*)v;
       table_pos  = face->vert_metrics_offset;
       table_size = face->vert_metrics_size;
     }