diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c708733645..a741e69564 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-22  Joel Brobecker  <brobecker@adacore.com>
+
+	* windows-nat.c (_initialize_loadable): Fix computing of
+	GetModuleFileNameEx.
+
 2015-12-21  Joel Brobecker  <brobecker@adacore.com>
 
 	* gdbtypes.c (create_array_type_with_stride): Fix indentation.
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index a7132d6210..5256037448 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -2830,7 +2830,8 @@ _initialize_loadable (void)
     {
       GPA (hm, EnumProcessModules);
       GPA (hm, GetModuleInformation);
-      GPA (hm, GetModuleFileNameEx);
+      GetModuleFileNameEx = (GetModuleFileNameEx_ftype *)
+        GetProcAddress (hm, GetModuleFileNameEx_name);
     }
 
   if (!EnumProcessModules || !GetModuleInformation || !GetModuleFileNameEx)