foo.diff

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f85725..07dd0fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## unreleased
+
+Bugfixes:
+
+  - (POTENTIALLY BREAKING CHANGE) peer-group membership needs to be applied to
+	peer inside each address-family, otherwise any peer-group properties in
+	that address-family scope are not used (@robbat2).
+
 ## 0.3.13 (2017-06-20)
 
 Features
diff --git a/metadata.rb b/metadata.rb
index 5e531dc..8cc0196 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -4,7 +4,7 @@ maintainer_email 'ian@f85.net'
 license 'Apache 2.0'
 description 'Generic Quagga cookbook'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '0.3.13'
+version '0.3.14'
 
 source_url 'https://github.com/floored1585/quagga-cookbook' if respond_to?(:source_url)
 issues_url 'https://github.com/floored1585/quagga-cookbook/issues' if respond_to?(:issues_url)
diff --git a/templates/default/bgpd.conf.erb b/templates/default/bgpd.conf.erb
index faa6bb6..50a6783 100644
--- a/templates/default/bgpd.conf.erb
+++ b/templates/default/bgpd.conf.erb
@@ -106,6 +106,9 @@ router bgp <%= asn %>
         <% data['neighbors'].sort_by(&method(:sort_by_bgp_neighbor)).each do |neighbor, neighbor_opts| -%>
           <% next unless neighbor_opts[address_family] -%>
  neighbor <%= neighbor %> activate
+          <% if neighbor_opts['peer_group'] && neighbor_opts['peer_group'].is_a?(String) -%>
+ neighbor <%= neighbor %> peer-group <%= opts['peer_group'] %>
+          <% end -%>
           <% if neighbor_opts['soft_reconfig_in'] -%>
  neighbor <%= neighbor %> soft-reconfiguration inbound
           <% end -%>