diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2a70bc1e9d..fe972296e9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-09  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* i386-tdep.h (struct gdbarch_tdep): Change type of
+	register_reggroup_p to gdbarch_register_reggroup_p_ftype.
+
 2015-10-09  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* cris-tdep.c (struct instruction_environment): Change type of
diff --git a/gdb/i386-tdep.h b/gdb/i386-tdep.h
index 7880f6ca59..95288baa1a 100644
--- a/gdb/i386-tdep.h
+++ b/gdb/i386-tdep.h
@@ -193,7 +193,7 @@ struct gdbarch_tdep
   const struct target_desc *tdesc;
 
   /* Register group function.  */
-  const void *register_reggroup_p;
+  gdbarch_register_reggroup_p_ftype *register_reggroup_p;
 
   /* Offset of saved PC in jmp_buf.  */
   int jb_pc_offset;