diff --git a/bridge/config/config.go b/bridge/config/config.go
index 78274165..a08ae00b 100644
--- a/bridge/config/config.go
+++ b/bridge/config/config.go
@@ -39,6 +39,8 @@ type ChannelInfo struct {
 type Protocol struct {
 	BindAddress            string // mattermost, slack
 	Buffer                 int    // api
+	EditSuffix             string // mattermost, slack, discord, telegram, gitter
+	EditDisable            bool   // mattermost, slack, discord, telegram, gitter
 	IconURL                string // mattermost, slack
 	IgnoreNicks            string // all protocols
 	Jid                    string // xmpp
diff --git a/changelog.md b/changelog.md
index 4efb1d42..f208f44b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,12 @@
+# v0.12.0
+## New features
+* general: add support for edited messages. 
+  Add new keyword EditDisable (false/true), default false. Which means by default edited messages will be sent to other bridges.
+  Add new keyword EditSuffix , default "". You can change this eg to "(edited)", this will be appended to every edit message.
+
+## Enhancements
+* discord: Strip custom emoji metadata (discord). Closes #148
+
 # v0.11.0
 ## New features
 * general: reusing the same account on multiple gateways now also reuses the connection.