diff --git a/ChangeLog b/ChangeLog
index 45e9b35b49..0e6eb43f77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-12  Bruno Haible  <bruno@clisp.org>
+
+	Rename module '_Noreturn' to 'snippet/_Noreturn'.
+	* modules/snippet/_Noreturn: Renamed from modules/_Noreturn.
+	(Files, Makefile.am): Update.
+	* build-aux/snippet/_Noreturn.h: Renamed from build-aux/_Noreturn.h.
+	* modules/stdlib (Depends-on): Update.
+
 2011-07-12  Bruno Haible  <bruno@clisp.org>
 
 	* NEWS: Mention the changes.
diff --git a/build-aux/_Noreturn.h b/build-aux/snippet/_Noreturn.h
similarity index 100%
rename from build-aux/_Noreturn.h
rename to build-aux/snippet/_Noreturn.h
diff --git a/modules/_Noreturn b/modules/snippet/_Noreturn
similarity index 80%
rename from modules/_Noreturn
rename to modules/snippet/_Noreturn
index 68ba4f71b2..2b93a70a27 100644
--- a/modules/_Noreturn
+++ b/modules/snippet/_Noreturn
@@ -5,7 +5,7 @@ Applicability:
 all
 
 Files:
-build-aux/_Noreturn.h
+build-aux/snippet/_Noreturn.h
 
 Depends-on:
 
@@ -16,7 +16,7 @@ Makefile.am:
 # gnulib Makefile snippets, it must be present in all Makefile.am that
 # need it. This is ensured by the applicability 'all' defined above.
 
-_NORETURN_H=$(top_srcdir)/build-aux/_Noreturn.h
+_NORETURN_H=$(top_srcdir)/build-aux/snippet/_Noreturn.h
 
 Include:
 
diff --git a/modules/stdlib b/modules/stdlib
index 380f13b6db..9ab19ee486 100644
--- a/modules/stdlib
+++ b/modules/stdlib
@@ -6,11 +6,11 @@ lib/stdlib.in.h
 m4/stdlib_h.m4
 
 Depends-on:
-_Noreturn
 include_next
 snippet/arg-nonnull
 snippet/c++defs
 snippet/warn-on-use
+snippet/_Noreturn
 stddef
 unistd