diff --git a/ChangeLog b/ChangeLog
index 7514e861dd..24de2e0a6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-10-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	[BZ #18822]
+	* include/mntent.h (__hasmntopt): Add libc_hidden_proto.
+	* misc/mntent_r.c (__hasmntopt): Add libc_hidden_def.
+
 2017-10-01  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #18822]
diff --git a/include/mntent.h b/include/mntent.h
index 169210fc66..a16298ed6e 100644
--- a/include/mntent.h
+++ b/include/mntent.h
@@ -15,6 +15,7 @@ extern char *__hasmntopt (const struct mntent *__mnt, const char *__opt);
 libc_hidden_proto (__setmntent)
 libc_hidden_proto (__getmntent_r)
 libc_hidden_proto (__endmntent)
+libc_hidden_proto (__hasmntopt)
 
 # endif /* !_ISOMAC */
 #endif
diff --git a/misc/mntent_r.c b/misc/mntent_r.c
index 30f55212be..96bd1e2fb4 100644
--- a/misc/mntent_r.c
+++ b/misc/mntent_r.c
@@ -293,4 +293,5 @@ __hasmntopt (const struct mntent *mnt, const char *opt)
 
   return NULL;
 }
+libc_hidden_def (__hasmntopt)
 weak_alias (__hasmntopt, hasmntopt)