diff --git a/include/ChangeLog b/include/ChangeLog
index 6343df66c..1e1e4b81c 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-28  Eli Zaretskii  <eliz@gnu.org>
+
+	* libiberty.h: (snprintf) [!HAVE_DECL_SNPRINTF]: Declare if
+	needed.
+	(vsnprintf) [!HAVE_DECL_VSNPRINTF]: Declare if needed.
+
 2005-05-25  Richard Henderson  <rth@redhat.com>
 
 	* demangle.h (DEMANGLE_COMPONENT_HIDDEN_ALIAS): New.
diff --git a/include/libiberty.h b/include/libiberty.h
index 9af981cd7..75cbedc23 100644
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -531,6 +531,16 @@ extern int vasprintf (char **, const char *, va_list)
   ATTRIBUTE_PRINTF(2,0);
 #endif
 
+#if defined(HAVE_DECL_SNPRINTF) && !HAVE_DECL_SNPRINTF
+/* Like sprintf but prints at most N characters.  */
+extern int snprintf (char *, size_t, const char *, ...) ATTRIBUTE_PRINTF_3;
+#endif
+
+#if defined(HAVE_DECL_VSNPRINTF) && !HAVE_DECL_VSNPRINTF
+/* Like vsprintf but prints at most N characters.  */
+extern int vsnprintf (char *, size_t, const char *, va_list);
+#endif
+
 #define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0]))
 
 /* Drastically simplified alloca configurator.  If we're using GCC,