diff --git a/ChangeLog b/ChangeLog
index 035a7585..beb42596 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 (Format: Year/Month/Day)
 Changes for 0.9.16:
+*06/04/06:
+   * Fix build on amd64 - some more size_t propagation and includes 
+    (Simon)
+    FbTk/... Text.hh/cc Font.cc
 *06/04/05:
    * Fix gcc 2.95.4 build error in ScreenPlacement.hh (Simon)
      ScreenPlacement.hh
diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc
index a946915d..8d8fbeca 100644
--- a/src/FbTk/Font.cc
+++ b/src/FbTk/Font.cc
@@ -250,7 +250,7 @@ Font::Font(const char *name):
     }
 
 #ifdef DEBUG
-    cerr<<"FbTk::Font m_iconv = "<<(int)m_iconv<<endl;
+    cerr<<"FbTk::Font m_iconv = "<<m_iconv<<endl;
 #endif // DEBUG
 
     if (name != 0) {
diff --git a/src/FbTk/Text.cc b/src/FbTk/Text.cc
index b4740222..d17aaac0 100644
--- a/src/FbTk/Text.cc
+++ b/src/FbTk/Text.cc
@@ -32,7 +32,7 @@ namespace FbTk {
 
 int doAlignment(int max_width, int bevel, FbTk::Justify justify, 
                 const FbTk::Font &font, const char * const text, 
-                unsigned int textlen, unsigned int &newlen) {
+                size_t textlen, size_t &newlen) {
 
     if (text == 0 || textlen == 0)
         return 0;
diff --git a/src/FbTk/Text.hh b/src/FbTk/Text.hh
index 53365464..01ee26e9 100644
--- a/src/FbTk/Text.hh
+++ b/src/FbTk/Text.hh
@@ -24,6 +24,8 @@
 #ifndef FBTK_TEXT_HH
 #define FBTK_TEXT_HH
 
+#include <sys/types.h>
+
 namespace FbTk {
 
 class Font;
@@ -37,7 +39,7 @@ enum Orientation { ROT0=0, ROT90, ROT180, ROT270 };
  */
 int doAlignment(int max_width, int bevel, FbTk::Justify justify, 
                 const FbTk::Font &font, const char * const text, 
-                unsigned int textlen, unsigned int &newlen);
+                size_t textlen, size_t &newlen);
 
 /**
    There are 3 interesting translations: