diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cd2bd4c170..0906b32e15 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,18 @@
+2017-10-16  Keith Seitz  <keiths@redhat.com>
+
+        * c-typeprint.c (enum access_specifier): Moved here from
+        c_type_print_base.
+        (output_access_specifier): New function.
+        (c_type_print_base): Consider typedefs when assessing
+        whether access labels are needed.
+        Use output_access_specifier as needed.
+        Output access specifier for typedefs, if needed.
+        * dwarf2read.c (dwarf2_add_typedef): Record DW_AT_accessibility.
+        * gdbtypes.h (struct typedef_field) <is_protected, is_private>: New
+        fields.
+        (TYPE_TYPEDEF_FIELD_PROTECTED, TYPE_TYPEDEF_FIELD_PRIVATE): New
+        accessor macros.
+
 2017-10-16  Tom Tromey  <tom@tromey.com>
 
 	* linux-tdep.c (linux_info_proc, linux_find_memory_regions_full)
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a4acfc6741..511d526580 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2017-10-16  Keith Seitz  <keiths@redhat.com>
+
+	* gdb.cp/classes.cc (class_with_typedefs, class_with_public_typedef)
+	(class_with_protected_typedef, class_with_private_typedef)
+	(struct_with_public_typedef, struct_with_protected_typedef)
+	(struct_with_private_typedef): New classes/structs.
+	* gdb.cp/classes.exp (test_ptype_class_objects): Add tests for
+	typedefs and access specifiers.
+
 2017-10-16  Pedro Alves  <palves@redhat.com>
 	    Simon Marchi  <simon.marchi@polymtl.ca>