diff --git a/Dockerfile b/Dockerfile
index f5e9e62f9a10c8bddd224e90b2b8b6bdfa4430c1..6a0af40fea83ff3e8ed74bc3a47e79f4abb2d66d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,43 @@
-FROM continuumio/miniconda
+FROM ubuntu:xenial
 MAINTAINER Bas Nijholt <bas@nijho.lt>
 
+ENV LANG=C.UTF-8 LC_ALL=C.UTF-8
+ENV PATH /opt/conda/bin:$PATH
+
+RUN apt-get update --fix-missing && apt-get install -y \
+    wget \
+    bzip2 \
+    ca-certificates \
+    libglib2.0-0 \
+    libxext6 \
+    libsm6 \
+    libxrender1 \
+    git \
+    mercurial \
+    subversion \
+    #texlive-full \
+    python-pygments\
+    gnuplot \
+    make \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda2-4.5.11-Linux-x86_64.sh -O ~/miniconda.sh && \
+    /bin/bash ~/miniconda.sh -b -p /opt/conda && \
+    rm ~/miniconda.sh && \
+    ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \
+    echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \
+    echo "conda activate base" >> ~/.bashrc
+
+RUN apt-get install -y curl grep sed dpkg && \
+    TINI_VERSION=`curl https://github.com/krallin/tini/releases/latest | grep -o "/v.*\"" | sed 's:^..\(.*\).$:\1:'` && \
+    curl -L "https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini_${TINI_VERSION}.deb" > tini.deb && \
+    dpkg -i tini.deb && \
+    rm tini.deb && \
+    apt-get clean
+
 RUN apt-get update -q && apt-get install -qy \
-#    texlive-full \
-#    python-pygments gnuplot \
-	build-essential \
+    texlive-full \
+    python-pygments gnuplot \
     make git \
     && rm -rf /var/lib/apt/lists/*
 
@@ -12,3 +45,6 @@ RUN mkdir /environments
 COPY environment.yml /environments/
 
 RUN conda-env create -f /environments/environment.yml
+
+ENTRYPOINT [ "/usr/bin/tini", "--" ]
+CMD [ "/bin/bash" ]