diff --git a/ChangeLog b/ChangeLog
index 9e2de4d52e..5a7d023392 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-28  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* misc/sys/cdefs.h (__attribute_format_strfmon__): Define.
+	* stdlib/monetary.h: Add strfmon format attributes.
+
 2000-12-28  Roland McGrath  <roland@frob.com>
 
 	* sysdeps/mach/hurd/ioctl.c (do_ioctl): Avoid double-increment after
diff --git a/stdlib/monetary.h b/stdlib/monetary.h
index e665f07e8f..29b89e23c9 100644
--- a/stdlib/monetary.h
+++ b/stdlib/monetary.h
@@ -1,5 +1,5 @@
 /* Header file for monetary value formatting functions.
-   Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -37,7 +37,8 @@ __BEGIN_DECLS
 
 /* Formatting a monetary value according to the current locale.  */
 extern ssize_t strfmon (char *__restrict __s, size_t __maxsize,
-			__const char *__restrict __format, ...) __THROW;
+			__const char *__restrict __format, ...)
+     __THROW __attribute_format_strfmon__ (3, 4);
 
 #ifdef __USE_GNU
 # include <xlocale.h>
@@ -45,7 +46,8 @@ extern ssize_t strfmon (char *__restrict __s, size_t __maxsize,
 /* Formatting a monetary value according to the current locale.  */
 extern ssize_t __strfmon_l (char *__restrict __s, size_t __maxsize,
 			    __locale_t loc,
-			    __const char *__restrict __format, ...) __THROW;
+			    __const char *__restrict __format, ...)
+     __THROW __attribute_format_strfmon__ (4, 5);
 #endif
 
 __END_DECLS