diff --git a/cdist/conf/type/__docker/man.rst b/cdist/conf/type/__docker/man.rst
new file mode 100644
index 00000000..80088983
--- /dev/null
+++ b/cdist/conf/type/__docker/man.rst
@@ -0,0 +1,49 @@
+cdist-type__docker(7)
+=====================
+
+NAME
+----
+cdist-type__docker - install docker-engine
+
+
+DESCRIPTION
+-----------
+Installs latest docker-engine package from dockerproject.org.
+
+
+REQUIRED PARAMETERS
+-------------------
+None.
+
+
+OPTIONAL PARAMETERS
+-------------------
+None.
+
+
+BOOLEAN PARAMETERS
+------------------
+experimental
+   Install the experimentel docker-engine package instead of the latest stable release.
+
+
+EXAMPLES
+--------
+
+.. code-block:: sh
+
+    __docker
+
+    # experimentel
+    __docker --experimental
+
+
+AUTHORS
+-------
+Steven Armstrong <steven-cdist--@--armstrong.cc>
+
+
+COPYING
+-------
+Copyright \(C) 2016 Steven Armstrong. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/cdist/conf/type/__docker/manifest b/cdist/conf/type/__docker/manifest
new file mode 100755
index 00000000..ba13b3e4
--- /dev/null
+++ b/cdist/conf/type/__docker/manifest
@@ -0,0 +1,81 @@
+#!/bin/sh
+#
+# 2016 Steven Armstrong (steven-cdist at armstrong.cc)
+#
+# 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/>.
+#
+
+
+os=$(cat "$__global/explorer/os")
+
+case "$os" in
+   centos)
+      component="main"
+      if [ -f "$__object/parameter/experimental" ]; then
+         component="experimental"
+      fi
+      export CDIST_ORDER_DEPENDENCY=on
+      __yum_repo docker \
+         --name 'Docker Repository' \
+         --baseurl "https://yum.dockerproject.org/repo/$component/centos/\$releasever/" \
+         --enabled \
+         --gpgcheck \
+         --gpgkey 'https://yum.dockerproject.org/gpg'
+      __package docker-engine
+      unset CDIST_ORDER_DEPENDENCY
+   ;;
+   ubuntu)
+      component="main"
+      if [ -f "$__object/parameter/experimental" ]; then
+         component="experimental"
+      fi
+      __package apparmor
+      __package ca-certificates
+      __package apt-transport-https
+      __apt_key docker --keyid 58118E89F3A912897C070ADBF76221572C52609D
+      export CDIST_ORDER_DEPENDENCY=on
+      __apt_source docker \
+         --uri https://apt.dockerproject.org/repo \
+         --distribution "ubuntu-$(cat "$__global/explorer/lsb_codename")" \
+         --component "$component"
+      __package docker-engine
+      unset CDIST_ORDER_DEPENDENCY
+   ;;
+   debian)
+       component="main"
+      if [ -f "$__object/parameter/experimental" ]; then
+         component="experimental"
+      fi
+
+      __package apt-transport-https
+      __package ca-certificates
+      __package gnupg2
+      __apt_key docker --keyid 58118E89F3A912897C070ADBF76221572C52609D
+      export CDIST_ORDER_DEPENDENCY=on
+      __apt_source docker \
+          --uri https://apt.dockerproject.org/repo \
+          --distribution "debian-$(cat "$__global/explorer/lsb_codename")" \
+          --component "$component"
+      __package docker-engine
+      unset CDIST_ORDER_DEPENDENCY
+
+   ;;
+   *)
+      echo "Your operating system ($os) is currently not supported by this type (${__type##*/})." >&2
+      echo "Please contribute an implementation for it if you can." >&2
+      exit 1
+   ;;
+esac
diff --git a/cdist/conf/type/__docker/parameter/boolean b/cdist/conf/type/__docker/parameter/boolean
new file mode 100644
index 00000000..9839eb20
--- /dev/null
+++ b/cdist/conf/type/__docker/parameter/boolean
@@ -0,0 +1 @@
+experimental
diff --git a/cdist/conf/type/__docker/singleton b/cdist/conf/type/__docker/singleton
new file mode 100644
index 00000000..e69de29b