diff --git a/common/ChangeLog b/common/ChangeLog
index dde8987d1..65126200c 100644
--- a/common/ChangeLog
+++ b/common/ChangeLog
@@ -1,5 +1,7 @@
 2008-06-18  Marcus Brinkmann  <marcus@g10code.de>
 
+	* sysutils.c (TRANS_MAX): Bump up to 350 to be on the safe side.
+
 	* sysutils.h (translate_table_init, translate_table_lookup): New
 	prototypes.
 	* sysutils.c: Include <ctype.h>.
diff --git a/common/sysutils.c b/common/sysutils.c
index 3b6d82c0a..b76c83990 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -314,7 +314,10 @@ static int fd_translate_len;
 void
 translate_table_init (void)
 {
-#define TRANS_MAX 100
+  /* Hold roughly 8 pairs of 64 bit numbers in hex notation:
+     "0xFEDCBA9876543210 0xFEDCBA9876543210".  8*19*2 - 1 = 303.  This
+     plans ahead for a time where a HANDLE is 64 bit.  */
+#define TRANS_MAX 350
   char line[TRANS_MAX + 1];
   char *linep;
   int idx;