diff --git a/bridge/keybase/keybase.go b/bridge/keybase/keybase.go
index cfe13e89..4033d731 100644
--- a/bridge/keybase/keybase.go
+++ b/bridge/keybase/keybase.go
@@ -64,8 +64,7 @@ func (b *Bkeybase) Send(msg config.Message) (string, error) {
 	// kbchat lib does not support message editing yet
 
 	// Send regular message
-	body := msg.Username + ": " + msg.Text
-	resp, err := b.kbc.SendMessageByTeamName(b.team, body, &b.channel)
+	resp, err := b.kbc.SendMessageByTeamName(b.team, msg.Username+msg.Text, &b.channel)
 	if err != nil {
 		return "", err
 	}
diff --git a/matterbridge.toml.sample b/matterbridge.toml.sample
index 4a50aed1..de75c8df 100644
--- a/matterbridge.toml.sample
+++ b/matterbridge.toml.sample
@@ -522,6 +522,29 @@ StripNick=false
 #OPTIONAL (default false)
 ShowTopicChange=false
 
+###################################################################
+#
+# Keybase
+# You should have a separate bridge account on Keybase
+# (it also needs to be logged in on the system you're running the bridge on)
+#
+###################################################################
+
+[keybase.myteam]
+
+# RemoteNickFormat defines how remote users appear on this bridge 
+# See [general] config section for default options
+RemoteNickFormat="{NICK} ({PROTOCOL}): "
+
+# extra label that can be used in the RemoteNickFormat
+# optional (default empty)
+Label=""
+
+# Your team on Keybase.
+# The bot user MUST be a member of this team
+# REQUIRED
+Team="myteam"
+
 ###################################################################
 #slack section
 ###################################################################