diff --git a/.cvsignore b/.cvsignore
index ddc9d843d9340977e5c9a3101b1bb5fd49ed4051..692f980e2849acc9aa0ade2bf58c0de221a3fea6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -17,6 +17,7 @@ config.status
 configure
 desdata
 keymap.h
+nettle-types.h
 nettle.aux
 nettle.cp
 nettle.cps
diff --git a/.gitignore b/.gitignore
index 294fd4c877d4b0843f1d16b74b45e5d485f59773..dfd505cd31e4986dea7cc6e8affd34f0a0898d26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,6 +49,7 @@ core
 /configure
 /desdata
 /keymap.h
+/nettle-types.h
 /nettle.aux
 /nettle.cp
 /nettle.cps
diff --git a/ChangeLog b/ChangeLog
index 52cb7bdf80a03532c86447acb7eb06c2a695aa73..29cd5e914e1c8d1a93285c46e88175a5d73d9925 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-01-07  Niels Möller  <nisse@harpo.hack.org>
+
+	* nettle-types.h: New (generated) file, to be used instead of
+	including <inttypes.h> directly. Updated all users of inttypes.h.
+	
+	* Makefile.am (DISTCLEANFILES, libnettleinclude_HEADERS): Added
+	nettle-types.h. 
+
+	* configure.ac (AX_CREATE_STDINT_H): Create nettle-types.h.
+
 2003-11-16  Niels Möller  <nisse@harpo.hack.org>
 
 	* yarrow256.c (yarrow256_seed): Use const for the seed_file input.
diff --git a/NEWS b/NEWS
index fbb21033fb159a043046b6598692a7cf2d0971a9..0fc013e40e6444b1d0ed86bcd96147c1a7528b04 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 NEWS for the 1.8 release
 
+	Uses AX_CREATE_STDINT_H, to support systems without
+	inttypes.h.
+
 	New name mangling, to reduce the risk of link collisions. All
 	functions (except memxor) now use a nettle_ or _nettle prefix
 	when seen by the linker. For most functions, the header file