diff --git a/README.rst b/README.rst
index 7764a4f..76ef3ef 100644
--- a/README.rst
+++ b/README.rst
@@ -15,6 +15,7 @@ Features
 * Commands in the container are run as the calling user, so that any created files have the expected ownership, (i.e. not root).
 * Make variables (`CC`, `LD` etc) are set to point to the appropriate tools in the container.
 * Recent `CMake <https://cmake.org>`_ and ninja are precompiled.
+* `Conan.io <https://www.conan.io>`_ can be used as a package manager.
 * Toolchain files configured for CMake.
 * Current directory is mounted as the container's workdir, ``/work``.
 * Works with the `Docker for Mac <https://docs.docker.com/docker-for-mac/>`_ and `Docker for Windows <https://docs.docker.com/docker-for-windows/>`_.
diff --git a/common.debian b/common.debian
index 6140f15..8ffd087 100644
--- a/common.debian
+++ b/common.debian
@@ -20,6 +20,7 @@ RUN apt-get update && apt-get install \
   pkg-config \
   libtool \
   python \
+  python-pip \
   rsync \
   sed \
   bison \
diff --git a/common.docker b/common.docker
index 19919e3..e71a587 100644
--- a/common.docker
+++ b/common.docker
@@ -26,6 +26,8 @@ RUN \
     -python $([ -e /opt/python/cp35-cp35m/bin/python ] && echo "/opt/python/cp35-cp35m/bin/python" || echo "python") && \
   rm /dockcross/install-ninja.sh
 
+RUN pip install conan
+
 RUN echo "root:root" | chpasswd
 WORKDIR /work
 ENTRYPOINT ["/dockcross/entrypoint.sh"]