diff --git a/gold/ChangeLog b/gold/ChangeLog
index 1ba6c31c0e..a5bb5c6c94 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -41,6 +41,18 @@
 	* plugin.cc (do_should_include_member): Ignore LDPK_UNDEF and
 	LDPK_WEAKUNDEF symbols.
 
+2016-03-03  Than McIntosh  <thanm@google.com>
+
+	* plugin.cc (Plugin::load): Include hooks for get_input_section_size
+	and get_input_section_alignment in transfer vector.
+	(get_input_section_alignment): New function.
+	(get_input_section_size): New function.
+	* testsuite/Makefile.am: Add plugin_layout_with_alignment.sh test.
+	* testsuite/Makefile.in: [Regenerate.]
+	* testsuite/plugin_section_alignment.cc: New test file.
+	* testsuite/plugin_layout_with_alignment.cc: New test file.
+	* testsuite/plugin_layout_with_alignment.sh: New test file.
+
 2015-03-03  Evgenii Stepanov  <eugenis@google.com>
 
 	* plugin.h (Pluginobj::get_symbol_resolution_info): Add version
diff --git a/gold/testsuite/plugin_layout_with_alignment.sh b/gold/testsuite/plugin_layout_with_alignment.sh
old mode 100644
new mode 100755
diff --git a/include/ChangeLog b/include/ChangeLog
index 70f62cf314..8821f78a33 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -3,6 +3,17 @@
 	* arm.h (ARM_ARCH_V8_1A): Add FPU_NEON_EXT_RDMA.
 	(ARM_CPU_HAS_FEATURE): Add comment.
 
+2016-03-03  Than McIntosh <thanm@google.com>
+
+	* plugin-api.h: Add new hooks to the plugin transfer vector to
+	to support querying section alignment and section size.
+	(ld_plugin_get_input_section_alignment): New hook.
+	(ld_plugin_get_input_section_size): New hook.
+	(ld_plugin_tag): Add LDPT_GET_INPUT_SECTION_ALIGNMENT
+	and LDPT_GET_INPUT_SECTION_SIZE.
+	(ld_plugin_tv): Add tv_get_input_section_alignment and
+	tv_get_input_section_size.
+
 2015-03-03  Evgenii Stepanov  <eugenis@google.com>
 
 	* plugin-api.h (enum ld_plugin_tag): Add LDPT_GET_SYMBOLS_V3.