diff --git a/ChangeLog b/ChangeLog
index 067606578..ea011b7d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-09-15  Khem Raj <raj.khem@gmail.com>
+	* grub-core/kern/emu/hostfs.c: use _DEFAULT_SOURCE in addition to
+	_BSD_SOURCE to avoid warnings under glibc 2.20+.
+
 2014-09-08  Michael Chang  <mchang@suse.com>
 
 	* grub-core/fs/btrfs.c (grub_btrfs_extent_read): Fix extent size
diff --git a/grub-core/kern/emu/hostfs.c b/grub-core/kern/emu/hostfs.c
index 7e725f65f..823116da6 100644
--- a/grub-core/kern/emu/hostfs.c
+++ b/grub-core/kern/emu/hostfs.c
@@ -19,7 +19,11 @@
 
 #include <config-util.h>
 
+/* Legacy feature macro.*/
 #define _BSD_SOURCE
+/* New feature macro that provides everything _BSD_SOURCE and
+ *    _SVID_SOURCE provided and possibly more.  */
+#define _DEFAULT_SOURCE
 #include <grub/fs.h>
 #include <grub/file.h>
 #include <grub/disk.h>