diff --git a/howto/ldap.md b/howto/ldap.md
index 7c2f77d7524526568108328202ec89a00d2593a0..e4fa6095e005f7b27ea076a2983b000d76719a65 100644
--- a/howto/ldap.md
+++ b/howto/ldap.md
@@ -422,6 +422,11 @@ done through those steps:
  3. build the Debian package: `git buildpackage`
  4. deploy the Debian package
 
+Note that you may want to review our feature branches to see if
+our changes have been accepted upstream and, if not, update and resend
+the feature branches. See the [branch policy](#branching-policy) documentation for
+more ideas.
+
 Note that unless the change is trivial, the Debian package should be
 deployed *very* carefully. Because userdir-ldap is such a critical
 piece of infrastructure, it can easily break stuff like PAM and