diff --git a/ChangeLog b/ChangeLog
index 7363f39565..795be448b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-11  Andreas Schwab  <schwab@redhat.com>
+
+	* bits/confname.h: Add missing comma, remove trailing commas.
+
 2010-01-10  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/bits/sigaction.h: SA_RESTART, SA_NODEFER,
diff --git a/bits/confname.h b/bits/confname.h
index b3c33a9864..45fcafbff9 100644
--- a/bits/confname.h
+++ b/bits/confname.h
@@ -527,7 +527,7 @@ enum
 
     _SC_THREAD_ROBUST_PRIO_INHERIT,
 #define _SC_THREAD_ROBUST_PRIO_INHERIT	_SC_THREAD_ROBUST_PRIO_INHERIT
-    _SC_THREAD_ROBUST_PRIO_PROTECT,
+    _SC_THREAD_ROBUST_PRIO_PROTECT
 #define _SC_THREAD_ROBUST_PRIO_PROTECT	_SC_THREAD_ROBUST_PRIO_PROTECT
   };
 
@@ -667,11 +667,11 @@ enum
 #define _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS
     _CS_POSIX_V7_LPBIG_OFFBIG_LIBS,
 #define _CS_POSIX_V7_LPBIG_OFFBIG_LIBS _CS_POSIX_V7_LPBIG_OFFBIG_LIBS
-    _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS
+    _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS,
 #define _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS
 
     _CS_V6_ENV,
 #define _CS_V6_ENV			_CS_V6_ENV
-    _CS_V7_ENV,
+    _CS_V7_ENV
 #define _CS_V7_ENV			_CS_V7_ENV
   };