diff --git a/cdist/conf/type/__docker_compose/gencode-remote b/cdist/conf/type/__docker_compose/gencode-remote
new file mode 100644
index 00000000..f22823d3
--- /dev/null
+++ b/cdist/conf/type/__docker_compose/gencode-remote
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# 2016 Dominique Roux (dominique.roux at ungleich.ch)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+
+# Variables
+version="$(cat "$__object/parameter/version")"
+
+# Download docker-compose file
+echo 'curl -L "https://github.com/docker/compose/releases/download/'${version}'/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose'
+
+# Change permissions
+echo 'chmod +x /usr/local/bin/docker-compose'
diff --git a/cdist/conf/type/__docker_compose/man.rst b/cdist/conf/type/__docker_compose/man.rst
new file mode 100644
index 00000000..720a306e
--- /dev/null
+++ b/cdist/conf/type/__docker_compose/man.rst
@@ -0,0 +1,49 @@
+cdist-type__docker_compose(7)
+=============================
+
+NAME
+----
+cdist-type__docker_compose - install docker-compose
+
+
+DESCRIPTION
+-----------
+Installs docker-compose package.
+
+
+REQUIRED PARAMETERS
+-------------------
+None.
+
+
+OPTIONAL PARAMETERS
+-------------------
+version
+   Define docker_compose version, defaults to "1.9.0" 
+
+
+BOOLEAN PARAMETERS
+------------------
+None.
+
+
+EXAMPLES
+--------
+
+.. code-block:: sh
+
+    __docker_compose
+
+    # Install version 1.9.0-rc4
+    __docker_compose --version 1.9.0-rc4
+
+
+AUTHORS
+-------
+Dominique Roux <dominique.roux--@--ungleich.ch>
+
+
+COPYING
+-------
+Copyright \(C) 2016 Dominique Roux. Free use of this software is
+granted under the terms of the GNU General Public License version 3 or later (GPLv3+).
diff --git a/cdist/conf/type/__docker_compose/manifest b/cdist/conf/type/__docker_compose/manifest
new file mode 100644
index 00000000..2ff80aca
--- /dev/null
+++ b/cdist/conf/type/__docker_compose/manifest
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# 2016 Dominique Roux (dominique.roux at ungleich.ch)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+
+# Needed packages
+__docker
+__package curl
diff --git a/cdist/conf/type/__docker_compose/parameter/default/version b/cdist/conf/type/__docker_compose/parameter/default/version
new file mode 100644
index 00000000..f8e233b2
--- /dev/null
+++ b/cdist/conf/type/__docker_compose/parameter/default/version
@@ -0,0 +1 @@
+1.9.0
diff --git a/cdist/conf/type/__docker_compose/parameter/optional b/cdist/conf/type/__docker_compose/parameter/optional
new file mode 100644
index 00000000..088eda41
--- /dev/null
+++ b/cdist/conf/type/__docker_compose/parameter/optional
@@ -0,0 +1 @@
+version
diff --git a/cdist/conf/type/__docker_compose/singleton b/cdist/conf/type/__docker_compose/singleton
new file mode 100644
index 00000000..e69de29b