2 files changed, 2 insertions, 1 deletions
diff --git a/src/ircd.c b/src/ircd.c
index d7bb5e9..72c6d40 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -312,6 +312,7 @@ initialize_server_capabs(void)
 #ifdef HALFOPS
   add_capability("HOPS", CAP_HOPS, 1);
 #endif
+  add_capability("CERTFP", CAP_CERTFP, 1);
 }
 
 /* write_pidfile()
diff --git a/src/s_user.c b/src/s_user.c
index 9e861a4..9cf2aa9 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -650,7 +650,7 @@ introduce_client(struct Client *source_p)
                    source_p->servptr->name, source_p->info);
     }
 
-    if (!EmptyString(source_p->certfp))
+    if (!EmptyString(source_p->certfp) && IsCapable(server, CAP_CERTFP))
       sendto_one(server, ":%s CERTFP %s", ID(source_p), source_p->certfp);
   }
 }