diff --git a/doc/bird.sgml b/doc/bird.sgml
index 36453f73..7074561d 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -2492,9 +2492,9 @@ protocols are notified and act accordingly (e.g. break an OSPF adjacency when
 the BFD session went down).
 
 <p>BIRD implements basic BFD behavior as defined in <rfc id="5880"> (some
-advanced features like the echo mode or authentication are not implemented), IP
-transport for BFD as defined in <rfc id="5881"> and <rfc id="5883"> and
-interaction with client protocols as defined in <rfc id="5882">.
+advanced features like the echo mode are not implemented), IP transport for BFD
+as defined in <rfc id="5881"> and <rfc id="5883"> and interaction with client
+protocols as defined in <rfc id="5882">.
 
 <p>BFD packets are sent with a dynamic source port number. Linux systems use by
 default a bit different dynamic port range than the IANA approved one
@@ -2534,6 +2534,7 @@ milliseconds.
 <code>
 protocol bfd [&lt;name&gt;] {
 	accept [ipv4|ipv6] [direct|multihop];
+	strict bind &lt;switch&gt;;
 	zero udp6 checksum rx &lt;switch&gt;;
 	interface &lt;interface pattern&gt; {
 		interval &lt;time&gt;;
diff --git a/lib/tlists.h b/lib/tlists.h
index 96172ad6..a652ba50 100644
--- a/lib/tlists.h
+++ b/lib/tlists.h
@@ -193,6 +193,7 @@ static inline void TLIST_NAME(rem_node)(TLIST_LIST_STRUCT *list, TLIST_TYPE *nod
 #undef TLIST_WANT_ADD_HEAD
 #undef TLIST_WANT_ADD_TAIL
 #undef TLIST_WANT_UPDATE_NODE
+#undef TLIST_DEFINED_BEFORE
 
 # endif
 #else