diff --git a/ChangeLog b/ChangeLog
index 4f34d4bff0..d25a8fd56c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2017-08-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	[BZ #18822]
+	* sysdeps/unix/sysv/linux/x86/libc-vdso.h (VDSO_SYMBOL(getcpu)):
+	Add attribute_hidden.
+
+2017-08-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+	[BZ #21864]
+	* Makerules (all-nonlib): Add $(others-extras).
+	* catgets/Makefile (others-extras): New.
+	* elf/Makefile (others-extras): Likewise.
+	* nss/Makefile (others-extras): Likewise.
+
 2017-08-21  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #18822]
diff --git a/sysdeps/unix/sysv/linux/x86/libc-vdso.h b/sysdeps/unix/sysv/linux/x86/libc-vdso.h
index 6cc3285461..89c70b4e42 100644
--- a/sysdeps/unix/sysv/linux/x86/libc-vdso.h
+++ b/sysdeps/unix/sysv/linux/x86/libc-vdso.h
@@ -29,7 +29,8 @@
 extern long int (*VDSO_SYMBOL(clock_gettime)) (clockid_t, struct timespec *)
   attribute_hidden;
 
-extern long int (*VDSO_SYMBOL(getcpu)) (unsigned *, unsigned *, void *);
+extern long int (*VDSO_SYMBOL(getcpu)) (unsigned *, unsigned *, void *)
+  attribute_hidden;
 
 #endif