diff --git a/Dockerfile b/Dockerfile
index d09f5ec..0c7cdb5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM phusion/baseimage:0.9.13
+FROM phusion/baseimage:latest
 MAINTAINER Nicolas Pace <nicolas.pace@unixono.com.ar>
 
 # Set correct environment variables.
@@ -13,10 +13,14 @@ RUN /etc/my_init.d/00_regen_ssh_host_keys.sh
 CMD ["/sbin/my_init"]
 
 RUN apt-get update && \
-    apt-get -y install git-core build-essential pkg-config libtool libevent-dev libncurses-dev zlib1g-dev automake libssh-dev cmake ruby && \
+    apt-get -y install git-core build-essential pkg-config libtool libevent-dev libncurses-dev zlib1g-dev automake libssh-dev cmake ruby wget && \
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-RUN git clone https://github.com/nviennot/tmate-slave.git
+RUN wget https://github.com/msgpack/msgpack-c/releases/download/cpp-1.3.0/msgpack-1.3.0.tar.gz -O /msgpack-1.3.0.tar.gz && \
+    mkdir -p /usr/src/msgpack && tar zxf /msgpack-1.3.0.tar.gz --strip-components 1 -C /usr/src/msgpack && \
+    cd /usr/src/msgpack && ./configure --prefix=/usr && make && make install && rm -rf /msgpack-1.3.0.tar.gz /usr/src/msgpack
+
+RUN git clone https://github.com/afirel/tmate-slave.git
 
 RUN cd tmate-slave && \
     ./create_keys.sh && \