diff --git a/Dockerfile b/Dockerfile
index e19ac01..faa9723 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,16 @@
-FROM buildpack-deps:jessie-curl
+FROM buildpack-deps:stretch-curl
 MAINTAINER Michele Bologna <michele.bologna@gmail.com>
 
 ENV VERSION=3.5.1
 
-RUN apt-get update && apt-get install -y --no-install-recommends autoconf automake gettext gcc libtool make dpkg-dev libglib2.0-dev libotr5-dev libpurple-dev libgnutls28-dev libjson-glib-dev libprotobuf-c-dev protobuf-c-compiler mercurial libgcrypt20 libgcrypt20-dev libwebp-dev && \
+RUN apt-get update && apt-get install -y --no-install-recommends autoconf automake gettext gcc libtool make dpkg-dev libglib2.0-dev libotr5-dev libpurple-dev libgnutls28-dev libjson-glib-dev libprotobuf-c-dev protobuf-c-compiler mercurial libgcrypt20 libgcrypt20-dev libwebp-dev git && \
 cd && \
 curl -LO# https://get.bitlbee.org/src/bitlbee-$VERSION.tar.gz && \
 curl -LO# https://github.com/EionRobb/skype4pidgin/archive/1.4.tar.gz && \
 curl -LO# https://github.com/majn/telegram-purple/releases/download/v1.3.1/telegram-purple_1.3.1.orig.tar.gz && \
 curl -LO# https://github.com/jgeboski/bitlbee-facebook/archive/v1.1.2.tar.gz && \
 hg clone https://bitbucket.org/EionRobb/purple-hangouts/ && \
+git clone https://alexschroeder.ch/cgit/bitlbee-mastodon && \
 tar zxvf bitlbee-$VERSION.tar.gz && \
 cd bitlbee-$VERSION && \
 ./configure --jabber=1 --otr=1 --purple=1 && \
@@ -41,6 +42,14 @@ cd && \
 cd purple-hangouts && \
 make && \
 make install && \
+# install bitlbee-mastodon
+cd && \
+cd bitlbee-mastodon && \
+./autogen.sh && \
+./configure --prefix=/usr && \
+make && \
+make install && \
+# cleanup
 apt-get autoremove -y --purge autoconf automake gcc libtool make dpkg-dev mercurial && \
 apt-get clean && \
 rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /tmp/* && \
@@ -51,6 +60,7 @@ rm -fr v1.1.2.tar.gz bitlbee-facebook-* && \
 rm -fr purple-hangouts && \
 rm -fr telegram-purple_1.3.1.orig.tar.gz && \
 rm -fr telegram-purple && \
+rm -rf bitlbee-mastodon && \
 mkdir -p /var/lib/bitlbee && \
 chown -R daemon:daemon /var/lib/bitlbee* # dup: otherwise it won't be chown'ed when using volumes