diff --git a/ChangeLog b/ChangeLog
index 10381aa67c956a3073904abec22d8ac16b9d5dc4..49903d06cb3b639a9630b41b4b12b12a74360f04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-07  Niels Möller  <nisse@lysator.liu.se>
+
+	* nettle-types.h (_STDINT_HAVE_INT_FAST32_T): Define here, to
+	force nettle-stdint.h to not try to define the int_fast*_t types.
+	Avoids compilation gnutls problems on SunOS-5.8, where the
+	definitions here collide with gnulib's.
+
 2012-04-23  Niels Möller  <nisse@lysator.liu.se>
 
 	* nettle-internal.h (NETTLE_MAX_BIGNUM_SIZE): New constant. Based
diff --git a/nettle-types.h b/nettle-types.h
index b694332eeec4ec3676961ffbd028606284fdeb00..9406c6f6d7d454680ef40535dfbe34ae8469bd93 100644
--- a/nettle-types.h
+++ b/nettle-types.h
@@ -23,6 +23,9 @@
 #ifndef NETTLE_TYPES_H
 #define NETTLE_TYPES_H
 
+/* Pretend these types always exists. Nettle doesn't use them. */
+#define _STDINT_HAVE_INT_FAST32_T 1
+
 #include "nettle-stdint.h"
 
 #ifdef __cplusplus