diff --git a/ChangeLog b/ChangeLog
index b4fcd3062..e03dd626d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-03  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Tools/gdomap.c: Check for HAVE_STDINT_H for safety of include
+
 2006-03-01  Adam Fedor  <fedor@gnu.org>
 
 	* configure.ac: Add check for inet_pton. Also check for make-
diff --git a/Tools/gdomap.c b/Tools/gdomap.c
index 65fac09cc..450ab674d 100644
--- a/Tools/gdomap.c
+++ b/Tools/gdomap.c
@@ -18,7 +18,8 @@
 
    You should have received a copy of the GNU General Public
    License along with this library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02111 USA.
    */
 
 /* Ported to mingw 07/12/00 by Björn Giesler <Bjoern.Giesler@gmx.de> */
@@ -31,7 +32,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#endif
 #include <unistd.h>		/* for gethostname() */
 #ifndef __MINGW32__
 #include <sys/param.h>		/* for MAXHOSTNAMELEN */