diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e45b87df80..bcbaacfe22 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-26  Keith Seitz  <keiths@redhat.com>
+
+	* rs6000-tdep.c (rs6000_frame_cache): Explicitly cast return result
+	to avoid invalid conversion from void *.
+
 2016-02-26  Yao Qi  <yao.qi@linaro.org>
 
 	* arm-tdep.c (arm_record_exreg_ld_st_insn): Set 'single_reg'
diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index d0c56d76cc..c2b6638491 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -3239,7 +3239,7 @@ rs6000_frame_cache (struct frame_info *this_frame, void **this_cache)
     {
       if (ex.error != NOT_AVAILABLE_ERROR)
 	throw_exception (ex);
-      return (*this_cache);
+      return (struct rs6000_frame_cache *) (*this_cache);
     }
   END_CATCH