diff --git a/gateway/gateway.go b/gateway/gateway.go
index a8adc4f5..0fca9db5 100644
--- a/gateway/gateway.go
+++ b/gateway/gateway.go
@@ -11,7 +11,7 @@ import (
 	"sort"
 	"github.com/darkoatanasovski/htmltags"
 	"github.com/urakozz/go-emoji"
-	"github.com/patcon/html2md"
+	"github.com/lunny/html2md"
 
 	"github.com/42wim/matterbridge/bridge"
 	"github.com/42wim/matterbridge/bridge/api"
diff --git a/go.mod b/go.mod
index 5b42f3b4..c1f61acf 100644
--- a/go.mod
+++ b/go.mod
@@ -29,6 +29,7 @@ require (
 	github.com/labstack/echo v0.0.0-20180219162101-7eec915044a1
 	github.com/labstack/gommon v0.2.1 // indirect
 	github.com/lrstanley/girc v0.0.0-20180913221000-0fb5b684054e
+	github.com/lunny/html2md v0.0.0-20181018071239-7d234de44546
 	github.com/lusis/go-slackbot v0.0.0-20180109053408-401027ccfef5 // indirect
 	github.com/lusis/slack-test v0.0.0-20180109053238-3c758769bfa6 // indirect
 	github.com/magiconair/properties v0.0.0-20180217134545-2c9e95027885 // indirect
@@ -48,7 +49,7 @@ require (
 	github.com/nlopes/slack v0.4.1-0.20181015134011-cd5e66cd0632
 	github.com/onsi/ginkgo v1.6.0 // indirect
 	github.com/onsi/gomega v1.4.1 // indirect
-	github.com/lunny/html2md master
+	github.com/patcon/html2md v0.0.0-20180317074532-13aaeeae9fb2
 	github.com/paulrosania/go-charset v0.0.0-20151028000031-621bb39fcc83
 	github.com/pborman/uuid v0.0.0-20160216163710-c55201b03606 // indirect
 	github.com/pelletier/go-toml v0.0.0-20180228233631-05bcc0fb0d3e // indirect
diff --git a/go.sum b/go.sum
index 71c46066..f1e199dd 100644
--- a/go.sum
+++ b/go.sum
@@ -68,6 +68,8 @@ github.com/labstack/gommon v0.2.1 h1:C+I4NYknueQncqKYZQ34kHsLZJVeB5KwPUhnO0nmbpU
 github.com/labstack/gommon v0.2.1/go.mod h1:/tj9csK2iPSBvn+3NLM9e52usepMtrd5ilFYA+wQNJ4=
 github.com/lrstanley/girc v0.0.0-20180913221000-0fb5b684054e h1:RpktB2igr6nS1EN7bCvjldAEfngrM5GyAbmOa4/cafU=
 github.com/lrstanley/girc v0.0.0-20180913221000-0fb5b684054e/go.mod h1:7cRs1SIBfKQ7e3Tam6GKTILSNHzR862JD0JpINaZoJk=
+github.com/lunny/html2md v0.0.0-20181018071239-7d234de44546 h1:hqxaQP14eTbeZGHZhsDInzj9sJAnEufjVQL4bEA/p+8=
+github.com/lunny/html2md v0.0.0-20181018071239-7d234de44546/go.mod h1:lUUaVYlpAQ1Oo6vIZfec6CXQZjOvFZLyqaR8Dl7m+hk=
 github.com/lusis/go-slackbot v0.0.0-20180109053408-401027ccfef5 h1:AsEBgzv3DhuYHI/GiQh2HxvTP71HCCE9E/tzGUzGdtU=
 github.com/lusis/go-slackbot v0.0.0-20180109053408-401027ccfef5/go.mod h1:c2mYKRyMb1BPkO5St0c/ps62L4S0W2NAkaTXj9qEI+0=
 github.com/lusis/slack-test v0.0.0-20180109053238-3c758769bfa6 h1:iOAVXzZyXtW408TMYejlUPo6BIn92HmOacWtIfNyYns=