diff --git a/ChangeLog b/ChangeLog
index 17b8a553fa6e58ed37c96667ab7010503d61e3dd..101dbbfea4cda683e3968a1eb1b1475bc0e96397 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-30  Niels Möller  <nisse@lysator.liu.se>
+
+	* camellia-absorb.c: Include <limits.h>, needed for correct use of
+	HAVE_NATIVE_64_BIT. Reported and debugged by Magnus Holmgren.
+	Fixes debian build failure on s390x.
+
 2014-06-26  Niels Möller  <nisse@lysator.liu.se>
 
 	From Martin Storsjö:
@@ -15,7 +21,8 @@
 
 2014-06-25  Niels Möller  <nisse@lysator.liu.se>
 
-	Support for building with mini-gmp instead of the real GMP.
+	Support for building with mini-gmp instead of the real GMP. Loosely
+	based on work by Nikos Mavrogiannopoulos.
 	* configure.ac: New command line option --enable-mini-gmp. Also
 	disable all libgmp-related checks when enabled.
 	(NETTLE_USE_MINI_GMP): New substituted variable.
diff --git a/camellia-absorb.c b/camellia-absorb.c
index 09627fe603e9695f0afd65ff53433e70aa4fed7f..d865dc6df0fb9de45f19d0992a6dfd24a4c59e9b 100644
--- a/camellia-absorb.c
+++ b/camellia-absorb.c
@@ -47,6 +47,9 @@
 # include "config.h"
 #endif
 
+/* For CHAR_BIT, needed by HAVE_NATIVE_64_BIT */
+#include <limits.h>
+
 #include "camellia-internal.h"
 
 #include "macros.h"