--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-08-28  Bruno Haible  <bruno@clisp.org>
 
+	Rename module 'calloc' -> 'calloc-gnu'.
+	* modules/calloc-gnu: New file, copied from modules/calloc.
+	* modules/calloc: Convert to a redirection to 'calloc-gnu'. Mark as
+	obsolete.
+	* doc/posix-functions/calloc.texi: Update.
+	* NEWS: Mention the change.
+
 	Rename module 'malloc' -> 'malloc-gnu'.
 	* modules/malloc-gnu: New file, copied from modules/malloc.
 	* modules/malloc: Convert to a redirection to 'malloc-gnu'. Mark as

--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,9 @@
 
 Date        Modules         Changes
 
+2010-08-28  calloc          This module is deprecated. Use 'calloc-gnu'
+                            instead. It will be removed 2012-01-01.
+
 2010-08-28  malloc          This module is deprecated. Use 'malloc-gnu'
                             instead. It will be removed 2012-01-01.
 

--- a/doc/posix-functions/calloc.texi
+++ b/doc/posix-functions/calloc.texi
@@ -18,5 +18,5 @@
 @itemize
 @end itemize
 
-Extension: Gnulib provides a module @samp{calloc} that substitutes a
+Extension: Gnulib provides a module @samp{calloc-gnu} that substitutes a
 @code{calloc} implementation that behaves more like the glibc implementation.

--- a/modules/calloc
+++ b/modules/calloc
@@ -1,15 +1,18 @@
 Description:
 calloc() function that is glibc compatible.
 
+Status:
+obsolete
+
+Notice:
+This module is obsolete. Use the module 'calloc-gnu' instead.
+
 Files:
-lib/calloc.c
-m4/calloc.m4
 
 Depends-on:
-calloc-posix
+calloc-gnu
 
 configure.ac:
-gl_FUNC_CALLOC_GNU
 
 Makefile.am:
 

new file mode 100644
--- /dev/null
+++ b/modules/calloc-gnu
@@ -0,0 +1,23 @@
+Description:
+calloc() function that is glibc compatible.
+
+Files:
+lib/calloc.c
+m4/calloc.m4
+
+Depends-on:
+calloc-posix
+
+configure.ac:
+gl_FUNC_CALLOC_GNU
+
+Makefile.am:
+
+Include:
+<stdlib.h>
+
+License:
+GPL
+
+Maintainer:
+Jim Meyering