diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 376618d2f..b7dad6ca1 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-02  Corinna Vinschen  <corinna@vinschen.de>
+
+	* include/err.h (err): Add noreturn attribute.
+	(errx): Ditto.
+	(verr): Ditto.
+	(verrx): Ditto.
+
 2011-02-02  Corinna Vinschen  <corinna@vinschen.de>
 
 	* path.cc (conv_path_list): Remove enclosing quotes and trailing
diff --git a/winsup/cygwin/include/err.h b/winsup/cygwin/include/err.h
index d1002c527..21df32ece 100644
--- a/winsup/cygwin/include/err.h
+++ b/winsup/cygwin/include/err.h
@@ -1,6 +1,6 @@
 /* err.h
 
-   Copyright 2003 Red Hat, Inc.
+   Copyright 2003, 2011 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -16,17 +16,17 @@ details. */
 
 __BEGIN_DECLS
 
-extern void warn (const char *fmt, ...);
-extern void warnx (const char *fmt, ...);
+extern void warn (const char *fmt, ...)
+extern void warnx (const char *fmt, ...)
 
-extern void err (int eval, const char *fmt, ...);
-extern void errx (int eval, const char *fmt, ...);
+extern void err (int eval, const char *fmt, ...) __attribute__ ((__noreturn__));
+extern void errx (int eval, const char *fmt, ...) __attribute__ ((__noreturn__));
 
 extern void vwarn (const char *fmt, va_list ap);
 extern void vwarnx (const char *fmt, va_list ap);
 
-extern void verr (int eval, const char *fmt, va_list ap);
-extern void verrx (int eval, const char *fmt, va_list ap);
+extern void verr (int eval, const char *fmt, va_list ap) __attribute__ ((__noreturn__));
+extern void verrx (int eval, const char *fmt, va_list ap) __attribute__ ((__noreturn__));
 
 __END_DECLS