diff --git a/spec/Account_Interface_External_Password_Storage1.xml b/spec/Account_Interface_External_Password_Storage1.xml
index 29d393278a5d52c28a8a94af616fe658f194cda7..bfc7fd9fda031f4b23f78693ca5dc44d5b26f2a1 100644
--- a/spec/Account_Interface_External_Password_Storage1.xml
+++ b/spec/Account_Interface_External_Password_Storage1.xml
@@ -22,6 +22,7 @@
 
   <interface name="im.telepathy.v1.Account.Interface.ExternalPasswordStorage1"
     tp:causes-havoc="experimental">
+    <!-- https://bugs.freedesktop.org/show_bug.cgi?id=33485 -->
     <tp:added version="0.21.10">(draft 1)</tp:added>
     <tp:requires interface="im.telepathy.v1.Account"/>
 
diff --git a/spec/Call1_Interface_Mute.xml b/spec/Call1_Interface_Mute.xml
index 21eb64cdc2e89ca8f8328ec3038be7f06f77edb5..5b9daec1ded4dd8d4000418b3079f6ac8824f977 100644
--- a/spec/Call1_Interface_Mute.xml
+++ b/spec/Call1_Interface_Mute.xml
@@ -19,6 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
   </tp:license>
 
   <interface name="im.telepathy.v1.Call1.Interface.Mute" tp:causes-havoc="experimental">
+    <!-- https://bugs.freedesktop.org/show_bug.cgi?id=46442 -->
     <tp:added version="0.25.2">(as stable API)</tp:added>
     <tp:xor-requires>
       <tp:requires interface="im.telepathy.v1.Channel.Type.Call1"/>
diff --git a/spec/Channel_Interface_Addressing1.xml b/spec/Channel_Interface_Addressing1.xml
index ac6c198fa10da1a769891e00a915fccc1061edb8..7b4ff43273c6a72482be64f4d85d482898da2783 100644
--- a/spec/Channel_Interface_Addressing1.xml
+++ b/spec/Channel_Interface_Addressing1.xml
@@ -18,6 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
   </tp:license>
   <interface name="im.telepathy.v1.Channel.Interface.Addressing1"
              tp:causes-havoc="experimental">
+             <!-- https://bugs.freedesktop.org/show_bug.cgi?id=42918 -->
     <tp:added version="0.19.12">(as draft)</tp:added>
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>This interface provides properties that can be used for
diff --git a/spec/Channel_Interface_Credentials_Storage1.xml b/spec/Channel_Interface_Credentials_Storage1.xml
index 03c665ed646ac3f83be7d9915185a81bf853bee5..00ecd5bdfc7b7860e74741d0fcbbdae6b0f50e7b 100644
--- a/spec/Channel_Interface_Credentials_Storage1.xml
+++ b/spec/Channel_Interface_Credentials_Storage1.xml
@@ -19,6 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
   </tp:license>
   <interface name="im.telepathy.v1.Channel.Interface.CredentialsStorage1"
     tp:causes-havoc="experimental">
+    <!-- https://bugs.freedesktop.org/show_bug.cgi?id=33485 -->
     <tp:added version="0.21.10">(draft 1)</tp:added>
     <tp:requires interface="im.telepathy.v1.Channel.Interface.SASLAuthentication1"/>
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Channel_Interface_HTML1.xml b/spec/Channel_Interface_HTML1.xml
index 486ad942c5d0c294fa50eb2ecef31db37e7a37b4..f435d429ddab8f2376b7bf4fad1ba70e889c6be8 100644
--- a/spec/Channel_Interface_HTML1.xml
+++ b/spec/Channel_Interface_HTML1.xml
@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
   <interface
     name="im.telepathy.v1.Channel.Interface.HTML1"
     tp:causes-havoc="unfinished">
+    <!-- https://bugs.freedesktop.org/show_bug.cgi?id=15449 -->
     <tp:requires interface="im.telepathy.v1.Channel.Type.Text"/>
     <tp:added version="0.17.5">(draft version, not API-stable)</tp:added>
 
diff --git a/spec/Channel_Interface_Mergeable_Conference1.xml b/spec/Channel_Interface_Mergeable_Conference1.xml
index 2aea73a393fb19c051908b0043923823a81d5fc3..9efff2ae98977f9f9edabb5ed9ff5247769f4a3f 100644
--- a/spec/Channel_Interface_Mergeable_Conference1.xml
+++ b/spec/Channel_Interface_Mergeable_Conference1.xml
@@ -22,6 +22,7 @@
   <interface
     name="im.telepathy.v1.Channel.Interface.MergeableConference1"
     tp:causes-havoc="experimental">
+    <!-- https://bugs.freedesktop.org/show_bug.cgi?id=31660 -->
     <tp:added version="0.19.0">(draft 1)</tp:added>
     <tp:requires interface="im.telepathy.v1.Channel.Interface.Conference1"/>
 
diff --git a/spec/Channel_Interface_Picture1.xml b/spec/Channel_Interface_Picture1.xml
index 3b555faa5f778dd5c2ec83deb1510d3a11a4b64c..068208c9c5eaa2996ae7b9691eaba39e4542ddf9 100644
--- a/spec/Channel_Interface_Picture1.xml
+++ b/spec/Channel_Interface_Picture1.xml
@@ -22,6 +22,7 @@
 
   <interface name="im.telepathy.v1.Channel.Interface.Picture1"
              tp:causes-havoc="draft">
+             <!-- https://bugs.freedesktop.org/show_bug.cgi?id=42653 -->
     <tp:requires interface="im.telepathy.v1.Channel"/>
     <tp:added version="0.25.0"/>
     <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal"
diff --git a/spec/Channel_Interface_Splittable1.xml b/spec/Channel_Interface_Splittable1.xml
index f675c5d4a04582aeed2f0bf4287bfed4a4303e3f..a27cfd6098f32bd80bfb8eaafe4ca3b8af8d0131 100644
--- a/spec/Channel_Interface_Splittable1.xml
+++ b/spec/Channel_Interface_Splittable1.xml
@@ -22,6 +22,7 @@
   <interface
     name="im.telepathy.v1.Channel.Interface.Splittable1"
     tp:causes-havoc="experimental">
+    <!-- https://bugs.freedesktop.org/show_bug.cgi?id=31660 -->
     <tp:added version="0.19.0">(draft 1)</tp:added>
     <tp:requires interface="im.telepathy.v1.Channel"/>
 
diff --git a/spec/Client_Handler_Future.xml b/spec/Client_Handler_Future.xml
index 49a740d879eb91c41a3038efe14e2f8205a05703..39dab9181cf2b4bab16c7014678f6398faf2d30a 100644
--- a/spec/Client_Handler_Future.xml
+++ b/spec/Client_Handler_Future.xml
@@ -35,6 +35,7 @@
 
     <property name="BypassObservers" tp:name-for-bindings="Bypass_Observers"
       type="b" access="read">
+      <!-- https://bugs.freedesktop.org/show_bug.cgi?id=30043 -->
       <tp:added version="0.21.2"/>
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>If true, channels destined for this handler are not passed to
@@ -59,6 +60,7 @@ BypassObservers=true
     <property name="RelatedConferencesBypassApproval"
       tp:name-for-bindings="Related_Conferences_Bypass_Approval"
       type="b" access="read">
+      <!-- https://bugs.freedesktop.org/show_bug.cgi?id=71228 -->
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>If true, channels destined for this handler that have the
           <tp:dbus-ref namespace="im.telepathy.v1.Channel.Interface"
diff --git a/spec/Connection_Interface_Communication_Policy1.xml b/spec/Connection_Interface_Communication_Policy1.xml
index bbb14ab13ff63d159e1fe2c4e38764ff12dca091..7791326227c522f7987b2f26f65087efa24d46b2 100644
--- a/spec/Connection_Interface_Communication_Policy1.xml
+++ b/spec/Connection_Interface_Communication_Policy1.xml
@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
   <interface
      name="im.telepathy.v1.Connection.Interface.CommunicationPolicy1"
      tp:causes-havoc="experimental">
+     <!-- https://bugs.freedesktop.org/show_bug.cgi?id=24908 -->
     <tp:added version="0.21.1">(draft 1)</tp:added>
     <tp:requires interface="im.telepathy.v1.Connection.Interface.Presence1"/>
 
diff --git a/spec/Connection_Interface_Forwarding1.xml b/spec/Connection_Interface_Forwarding1.xml
index 28371ddb968ce9e98068b660f998c6e63e1010e6..cfe9ebaa908d3d786871e3be63274a80cc71c1b1 100644
--- a/spec/Connection_Interface_Forwarding1.xml
+++ b/spec/Connection_Interface_Forwarding1.xml
@@ -24,6 +24,7 @@
 
   <interface name="im.telepathy.v1.Connection.Interface.Forwarding1"
     tp:causes-havoc="experimental">
+    <!-- https://bugs.freedesktop.org/show_bug.cgi?id=13351 -->
     <tp:added version="0.19.6">(draft version, not API-stable)</tp:added>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Connection_Interface_Keepalive1.xml b/spec/Connection_Interface_Keepalive1.xml
index 7a1ed940f32d7ee1ec1784d72811e86a5abd3402..c1a0b42f4dc6603241836af17735c6fa5d782954 100644
--- a/spec/Connection_Interface_Keepalive1.xml
+++ b/spec/Connection_Interface_Keepalive1.xml
@@ -23,6 +23,7 @@
 
   <interface name="im.telepathy.v1.Connection.Interface.Keepalive1"
     tp:causes-havoc="experimental">
+    <!-- https://bugs.freedesktop.org/show_bug.cgi?id=30512 -->
     <tp:requires interface="im.telepathy.v1.Connection"/>
     <tp:added version="0.21.2">(draft 1)</tp:added>
 
diff --git a/spec/Connection_Interface_Resources1.xml b/spec/Connection_Interface_Resources1.xml
index ad5e4b0d16d665a584b77a624d02099b40c81107..ccbb885ef2c4f3aa400f67f4b683301c5fa9582d 100644
--- a/spec/Connection_Interface_Resources1.xml
+++ b/spec/Connection_Interface_Resources1.xml
@@ -19,6 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
   </tp:license>
   <interface name="im.telepathy.v1.Connection.Interface.Resources1"
     tp:causes-havoc="experimental">
+    <!-- https://bugs.freedesktop.org/show_bug.cgi?id=30461 -->
     <tp:added version="0.21.1">(draft 1)</tp:added>
     <tp:requires interface="im.telepathy.v1.Connection"/>
 
diff --git a/spec/Connection_Manager_Interface_Account_Storage1.xml b/spec/Connection_Manager_Interface_Account_Storage1.xml
index 6cd97ee28237d602dc3e623a2ca2c71d69d1edb1..c50a255f0053aa64fd584f76ef1897dd93a4984b 100644
--- a/spec/Connection_Manager_Interface_Account_Storage1.xml
+++ b/spec/Connection_Manager_Interface_Account_Storage1.xml
@@ -22,6 +22,7 @@
 
   <interface name="im.telepathy.v1.ConnectionManager.Interface.AccountStorage1"
     tp:causes-havoc="experimental">
+    <!-- https://bugs.freedesktop.org/show_bug.cgi?id=33485 -->
     <tp:added version="0.21.10">(draft 1)</tp:added>
     <tp:requires interface="im.telepathy.v1.ConnectionManager"/>
 
diff --git a/spec/template.xml b/spec/template.xml
index 1f829575eb8320339764bde89a70d230a12feae9..55eb7abfd38b17312bdb15f993cb2eae1e19690d 100644
--- a/spec/template.xml
+++ b/spec/template.xml
@@ -22,6 +22,7 @@
 
   <interface name="im.telepathy.v1.Foo1"
     tp:causes-havoc="experimental">
+    <!-- https://bugs.freedesktop.org/show_bug.cgi?id=XXX -->
     <tp:added version="0.UNRELEASED">(draft 1)</tp:added>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">