diff --git a/bin/build-helper b/bin/build-helper
index 1de2eb94..93401d3b 100755
--- a/bin/build-helper
+++ b/bin/build-helper
@@ -175,7 +175,7 @@ eof
 
     release-git-tag)
         target_version=$($0 changelog-version)
-        if git rev-parse --verify refs/tags/$target_version; then
+        if git rev-parse --verify refs/tags/$target_version 2>/dev/null; then
             echo "Tag for $target_version exists, aborting"
             exit 1
         fi
diff --git a/cdist/conf/explorer/cpu_cores b/cdist/conf/explorer/cpu_cores
new file mode 100755
index 00000000..efabc848
--- /dev/null
+++ b/cdist/conf/explorer/cpu_cores
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# 2014 Daniel Heule  (hda at sfs.biz)
+# 2014 Thomas Oettli (otho at sfs.biz)
+#
+# 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/>.
+#
+#
+
+# FIXME: other system types (not linux ...)
+
+if [ -r /proc/cpuinfo ]; then
+    cores="$(cat /proc/cpuinfo | grep "core id" | sort | uniq | wc -l)"
+    if [ ${cores} -eq 0 ]; then
+        cores="1"
+    fi
+    echo "${cores}"
+fi
diff --git a/cdist/conf/explorer/cpu_sockets b/cdist/conf/explorer/cpu_sockets
new file mode 100755
index 00000000..98836cec
--- /dev/null
+++ b/cdist/conf/explorer/cpu_sockets
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# 2014 Daniel Heule  (hda at sfs.biz)
+# 2014 Thomas Oettli (otho at sfs.biz)
+#
+# 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/>.
+#
+#
+
+# FIXME: other system types (not linux ...)
+
+if [ -r /proc/cpuinfo ]; then
+    sockets="$(cat /proc/cpuinfo | grep "physical id" | sort | uniq | wc -l)"
+    if [ ${sockets} -eq 0 ]; then
+        sockets="$(cat /proc/cpuinfo | grep "processor" | wc -l)"
+    fi
+    echo "${sockets}"
+fi
diff --git a/cdist/conf/explorer/machine_type b/cdist/conf/explorer/machine_type
new file mode 100755
index 00000000..74789f5a
--- /dev/null
+++ b/cdist/conf/explorer/machine_type
@@ -0,0 +1,54 @@
+#!/bin/sh
+#
+# 2014 Daniel Heule  (hda at sfs.biz)
+# 2014 Thomas Oettli (otho at sfs.biz)
+#
+# 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/>.
+#
+#
+
+# FIXME: other system types (not linux ...)
+
+if [ -r /proc/cpuinfo ]; then
+    # this should only exist on virtual guest machines,
+    # tested on vmware, xen, kvm
+    if grep -q "hypervisor" /proc/cpuinfo; then
+        # this file is aviable in xen guest systems
+        if [ -r /sys/hypervisor/type ]; then
+            if grep -q -i "xen" /sys/hypervisor/type; then
+                echo virtual_by_xen
+                exit 
+            fi
+        else
+            if [ -r /sys/class/dmi/id/product_name ]; then
+                if grep -q -i 'vmware' /sys/class/dmi/id/product_name; then
+                    echo "virtual_by_vmware"
+                    exit
+                else 
+                    if grep -q -i 'bochs' /sys/class/dmi/id/product_name; then
+                        echo "virtual_by_kvm"
+                        exit 
+                    fi
+                fi
+            fi
+        fi
+        echo "virtual_by_unknown"
+    else
+        echo "physical"
+    fi
+else
+    echo "unknown"
+fi
diff --git a/cdist/conf/explorer/memory b/cdist/conf/explorer/memory
new file mode 100755
index 00000000..982b5dfa
--- /dev/null
+++ b/cdist/conf/explorer/memory
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# 2014 Daniel Heule  (hda at sfs.biz)
+# 2014 Thomas Oettli (otho at sfs.biz)
+#
+# 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/>.
+#
+#
+
+# FIXME: other system types (not linux ...)
+
+if [ -r /proc/meminfo ]; then
+    echo "$(cat /proc/meminfo | grep "MemTotal:" | awk '{print $2}')"
+fi
diff --git a/cdist/conf/type/__dog_vdi/explorer/list b/cdist/conf/type/__dog_vdi/explorer/list
new file mode 100755
index 00000000..856c86fc
--- /dev/null
+++ b/cdist/conf/type/__dog_vdi/explorer/list
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# 2014 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# 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/>.
+#
+
+name="$__object_id"
+
+dog vdi list -r "$name"
diff --git a/cdist/conf/type/__dog_vdi/gencode-remote b/cdist/conf/type/__dog_vdi/gencode-remote
new file mode 100644
index 00000000..56e4108a
--- /dev/null
+++ b/cdist/conf/type/__dog_vdi/gencode-remote
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# 2014 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# 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/>.
+#
+
+state_should="$(cat "$__object/parameter/state")"
+num_vdi_lines=$(wc -l < "$__object/explorer/list")
+name="$__object_id"
+
+
+if [ "$num_vdi_lines" = 1 ]; then
+    state_is=present
+else
+    state_is=absent
+fi
+
+[ "$state_is" = "$state_should" ] && exit 0
+
+case "$state_should" in
+    present)
+        size="$(cat "$__object/parameter/size")"
+        echo "dog vdi create '$name' '$size'"
+    ;;
+    absent)
+        echo "dog vdi delete '$name'"
+    ;;
+esac
diff --git a/cdist/conf/type/__dog_vdi/man.text b/cdist/conf/type/__dog_vdi/man.text
new file mode 100644
index 00000000..e3453ba7
--- /dev/null
+++ b/cdist/conf/type/__dog_vdi/man.text
@@ -0,0 +1,56 @@
+cdist-type__dog_vdi(7)
+======================
+Nico Schottelius <nico-cdist--@--schottelius.org>
+
+
+NAME
+----
+cdist-type__dog_vdi - Manage Sheepdog VM images
+
+
+DESCRIPTION
+-----------
+The dog program is used to create images for sheepdog
+to be used in qemu.
+
+
+OPTIONAL PARAMETERS
+-------------------
+state::
+    Either "present" or "absent", defaults to "present"
+size::
+    Size of the image in "dog vdi" compatible units.
+
+    Required if state is "present".
+
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+# Create a 50G size image
+__dog_vdi nico-privat.sky.ungleich.ch --size 50G
+
+# Create a 50G size image (more explicit)
+__dog_vdi nico-privat.sky.ungleich.ch --size 50G --state present
+
+# Remove image
+__dog_vdi nico-privat.sky.ungleich.ch --state absent
+
+# Remove image - keeping --size is ok
+__dog_vdi nico-privat.sky.ungleich.ch --size 50G --state absent
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+- dog(8)
+- qemu(1)
+
+
+COPYING
+-------
+Copyright \(C) 2014 Nico Schottelius. 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/__dog_vdi/manifest b/cdist/conf/type/__dog_vdi/manifest
new file mode 100644
index 00000000..ab533c4b
--- /dev/null
+++ b/cdist/conf/type/__dog_vdi/manifest
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# 2014 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# 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/>.
+#
+
+state_should="$(cat "$__object/parameter/state")"
+
+case "$state_should" in
+    present)
+        if [ ! -f "$__object/parameter/size" ]; then
+            echo "Size is required when state is present" >&2
+            exit 1
+        fi
+    absent)
+        :
+    ;;
+    *)
+        echo "Unsupported state: $state_should" >&2
+        exit 1
+    ;;  
+esac
diff --git a/cdist/conf/type/__dog_vdi/parameter/default/state b/cdist/conf/type/__dog_vdi/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__dog_vdi/parameter/default/state
@@ -0,0 +1 @@
+present
diff --git a/cdist/conf/type/__dog_vdi/parameter/optional b/cdist/conf/type/__dog_vdi/parameter/optional
new file mode 100644
index 00000000..c3ac4490
--- /dev/null
+++ b/cdist/conf/type/__dog_vdi/parameter/optional
@@ -0,0 +1,2 @@
+state
+size
diff --git a/cdist/conf/type/__file/explorer/stat b/cdist/conf/type/__file/explorer/stat
index 298221b7..52570379 100755
--- a/cdist/conf/type/__file/explorer/stat
+++ b/cdist/conf/type/__file/explorer/stat
@@ -25,7 +25,7 @@ destination="/$__object_id"
 
 os=$("$__explorer/os")
 case "$os" in
-   "freebsd")
+   "freebsd"|"openbsd")
       # FIXME: should be something like this based on man page, but can not test
       stat -f "type: %ST
 owner: %Du %Su
diff --git a/cdist/conf/type/__iptables_rule/man.text b/cdist/conf/type/__iptables_rule/man.text
index eb230093..2f5b9785 100644
--- a/cdist/conf/type/__iptables_rule/man.text
+++ b/cdist/conf/type/__iptables_rule/man.text
@@ -41,7 +41,7 @@ __iptables_rule established  --rule "-A INPUT -m state --state RELATED,ESTABLISH
 
 # Some service rules
 __iptables_rule http  --rule "-A INPUT -p tcp --dport 80 -j ACCEPT"
-__iptables_rule ssh   --rule "-A INPUT -p tcp --dport 80 -j ACCEPT"
+__iptables_rule ssh   --rule "-A INPUT -p tcp --dport 22 -j ACCEPT"
 __iptables_rule https --rule "-A INPUT -p tcp --dport 443 -j ACCEPT"
 
 # Ensure some rules are not present anymore
diff --git a/cdist/conf/type/__jail/explorer/basepresent b/cdist/conf/type/__jail/explorer/basepresent
index f167a19c..034128d5 100755
--- a/cdist/conf/type/__jail/explorer/basepresent
+++ b/cdist/conf/type/__jail/explorer/basepresent
@@ -26,7 +26,7 @@
 #set -x
 
 if [ -f "$__object/parameter/jaildir" ]; then
-   jaildir="$(cat "$__object/parameter/name")"
+   jaildir="$(cat "$__object/parameter/jaildir")"
 else
    jaildir="/usr/jail"
 fi
diff --git a/cdist/conf/type/__jail/explorer/present b/cdist/conf/type/__jail/explorer/present
index 2ba3b2af..ddfb805c 100755
--- a/cdist/conf/type/__jail/explorer/present
+++ b/cdist/conf/type/__jail/explorer/present
@@ -32,7 +32,7 @@ else
 fi
 
 if [ -f "$__object/parameter/jaildir" ]; then
-   jaildir="$(cat "$__object/parameter/name")"
+   jaildir="$(cat "$__object/parameter/jaildir")"
 else
    jaildir="/usr/jail"
 fi
diff --git a/cdist/conf/type/__jail/explorer/status b/cdist/conf/type/__jail/explorer/status
index fe81eaf7..06f7d063 100755
--- a/cdist/conf/type/__jail/explorer/status
+++ b/cdist/conf/type/__jail/explorer/status
@@ -32,7 +32,7 @@ else
 fi
 
 if [ -f "$__object/parameter/jaildir" ]; then
-   jaildir="$(cat "$__object/parameter/name")"
+   jaildir="$(cat "$__object/parameter/jaildir")"
 else
    jaildir="/usr/jail"
 fi
diff --git a/cdist/conf/type/__key_value/gencode-remote b/cdist/conf/type/__key_value/gencode-remote
index b79d9688..e1041a02 100755
--- a/cdist/conf/type/__key_value/gencode-remote
+++ b/cdist/conf/type/__key_value/gencode-remote
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # 2011 Steven Armstrong (steven-cdist at armstrong.cc)
-# 2012 Nico Schottelius (nico-cdist at schottelius.org)
+# 2012-2014 Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #
@@ -42,12 +42,14 @@ cp -p "$file" "\$tmpfile"
 sed '/^$key\($delimiter\+\)/d' "$file" > "\$tmpfile"
 mv -f "\$tmpfile" "$file"
 DONE
+        echo "remove" >> "$__messages_out"
     ;;
     present)
         case "$state_is" in
             absent)
                 # add new key and value
                 printf 'echo "%s%s%s" >> "%s"' "$key" "$delimiter" "$value_escaped" "$file"
+                echo "add" >> "$__messages_out"
             ;;
             wrongvalue)
                 # change exisiting value
@@ -58,6 +60,7 @@ cp -p "$file" "\$tmpfile"
 sed "s|^$key\($delimiter\+\).*|$key\\1$value_escaped|" "$file" > "\$tmpfile"
 mv -f "\$tmpfile" "$file"
 DONE
+                echo "changevalue" >> "$__messages_out"
             ;;
             *)
                 echo "Unknown explorer state: $state_is" >&2
diff --git a/cdist/conf/type/__key_value/man.text b/cdist/conf/type/__key_value/man.text
index 1423fc7d..7def7139 100644
--- a/cdist/conf/type/__key_value/man.text
+++ b/cdist/conf/type/__key_value/man.text
@@ -32,6 +32,15 @@ key::
 value::
    The value for the key. Optional if state=absent, required otherwise.
 
+MESSAGES
+--------
+create::
+    Added key and value
+change::
+    Changed value of existing key
+remove::
+    Removed existing key and value
+
 
 EXAMPLES
 --------
diff --git a/cdist/conf/type/__line/gencode-remote b/cdist/conf/type/__line/gencode-remote
index 1fadf454..f73444e3 100755
--- a/cdist/conf/type/__line/gencode-remote
+++ b/cdist/conf/type/__line/gencode-remote
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
 # 2012 Nico Schottelius (nico-cdist at schottelius.org)
+# 2014 Steven Armstrong (steven-cdist at armstrong.cc)
 #
 # This file is part of cdist.
 #
@@ -74,8 +75,13 @@ case "$state_should" in
         fi
 
         cat << eof
-tmp=\$(mktemp)
-grep -v $greparg '$regex' '$file' > \$tmp && cat "\$tmp" > '$file' && rm -f "\$tmp"
+tmpfile=\$(mktemp ${file}.cdist.XXXXXXXXXX)
+# preserve ownership and permissions of existing file
+if [ -f "$file" ]; then
+   cp -p "$file" "\$tmpfile"
+fi
+grep -v $greparg '$regex' '$file' > \$tmpfile || true
+mv -f "\$tmpfile" "$file"
 eof
     ;;
     *)
diff --git a/cdist/conf/type/__link/explorer/state b/cdist/conf/type/__link/explorer/state
index a9220a3c..b8d8fc2b 100755
--- a/cdist/conf/type/__link/explorer/state
+++ b/cdist/conf/type/__link/explorer/state
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# 2012 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2012-2014 Steven Armstrong (steven-cdist at armstrong.cc)
 #
 # This file is part of cdist.
 #
@@ -34,8 +34,13 @@ case "$type" in
    symbolic)
       cd "$destination_dir"
       source_is=$(ls -l "$destination" | sed 's/.*-> //g')
-      if [ -h "$destination" -a "$source_is" = "$source" ]; then
-         echo present
+      if [ -h "$destination" ]; then
+         # ignore trailing slashes for comparison
+         if [ "${source_is%/}" = "${source%/}" ]; then
+            echo present
+         else
+            echo wrongsource
+         fi
       else
          echo absent
       fi
diff --git a/cdist/conf/type/__link/gencode-remote b/cdist/conf/type/__link/gencode-remote
index cbdfd30f..9e7831c7 100755
--- a/cdist/conf/type/__link/gencode-remote
+++ b/cdist/conf/type/__link/gencode-remote
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # 2011-2012 Nico Schottelius (nico-cdist at schottelius.org)
-# 2013 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2013-2014 Steven Armstrong (steven-cdist at armstrong.cc)
 #
 # This file is part of cdist.
 #
@@ -18,9 +18,6 @@
 # You should have received a copy of the GNU General Public License
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
-#
-# Mostly a wrapper for ln
-#
 
 destination="/$__object_id"
 
@@ -50,20 +47,22 @@ case "$state_should" in
     present)
         if [ "$file_type" = "directory" ]; then
             # our destination is currently a directory, delete it
-            cat << DONE
-rm -rf "$destination"
-DONE
+            printf 'rm -rf "%s" &&\n' "$destination"
+        else
+           if [ "$state_is" = "wrongsource" ]; then
+               # our destination is a symlink but points to the wrong source,
+               # delete it
+               printf 'rm -f "%s" &&\n' "$destination"
+           fi
         fi
 
         # create our link
-        cat << DONE
-ln ${lnopt} -f "$source" "$destination"
-DONE
+        printf 'ln %s -f "%s" "%s"\n' "$lnopt" "$source" "$destination"
     ;;
     absent)
         # only delete if it is a sym/hard link
         if [ "$file_type" = "symlink" -o "$file_type" = "hardlink" ]; then
-            echo rm -f \"$destination\"
+            printf 'rm -f "%s"\n' "$destination"
         fi
     ;;
     *)
diff --git a/cdist/conf/type/__package_pkg_openbsd/gencode-remote b/cdist/conf/type/__package_pkg_openbsd/gencode-remote
index 1df87997..08e15e89 100755
--- a/cdist/conf/type/__package_pkg_openbsd/gencode-remote
+++ b/cdist/conf/type/__package_pkg_openbsd/gencode-remote
@@ -50,8 +50,11 @@ fi
 
 pkg_version="$(cat "$__object/explorer/pkg_version")"
 
-# TODO: Shouldn't be hardcoded
-echo export PKG_PATH=ftp://ftp.openbsd.org/pub/OpenBSD/$os_version/packages/$machine/
+if [ -f "$__object/parameter/pkg_path" ]; then                                  
+  pkg_path="$(cat "$__object/parameter/pkg_path")"                              
+else
+  pkg_path="ftp://ftp.openbsd.org/pub/OpenBSD/$os_version/packages/$machine/"
+fi                                                                              
 
 if [ "$pkg_version" ]; then
     state_is="present"
@@ -65,12 +68,18 @@ case "$state_should" in
     present)
         # use this because pkg_add doesn't properly handle errors
         cat << eof
-status=\$(pkg_add "$pkgopts" "$name--$flavor")
+export PKG_PATH="$pkg_path"                                              
+status=\$(pkg_add "$pkgopts" "$name--$flavor" 2>&1)
+pkg_info | grep "^${name}.*${flavor}" > /dev/null 2>&1
 
-# no error
-if [ -n "\$status" ]; then
+# We didn't find the package in the list of 'installed packages', so it failed
+# This is necessary because pkg_add doesn't return properly
+if [ \$? -ne 0 ]; then
+    if [ -z "\${status}" ]; then
+      status="Failed to add package, uncaught exception."
+    fi
     echo "Error: \$status"
-	exit 1
+    exit 1
 fi
 eof
     ;;
@@ -79,9 +88,14 @@ eof
         # use this because pkg_add doesn't properly handle errors
         cat << eof
 status=\$(pkg_delete "$pkgopts" "$name--$flavor")
+pkg_info | grep "^${name}.*${flavor}" > /dev/null 2>&1
 
-# no error
-if [ -n "\$status" ]; then
+# We found the package in the list of 'installed packages'
+# This would indicate that pkg_delete failed, send the output of pkg_delete
+if [ \$? -eq 0 ]; then
+    if [ -z "\${status}" ]; then
+      status="Failed to remove package, uncaught exception."
+    fi
     echo "Error: \$status"
     exit 1
 fi
diff --git a/cdist/conf/type/__package_pkg_openbsd/man.text b/cdist/conf/type/__package_pkg_openbsd/man.text
index f523a892..c7de2652 100644
--- a/cdist/conf/type/__package_pkg_openbsd/man.text
+++ b/cdist/conf/type/__package_pkg_openbsd/man.text
@@ -29,6 +29,8 @@ flavor::
 state::
     Either "present" or "absent", defaults to "present"
 
+pkg_path::
+    Manually specify a PKG_PATH to add packages from.
 
 EXAMPLES
 --------
@@ -45,6 +47,10 @@ __package_pkg_openbsd python --state present --name python2
 
 # Remove obsolete package
 __package_pkg_openbsd puppet --state absent
+
+# Add a package using a particular mirror
+__package_pkg_openbsd bash \
+  --pkg_path http://openbsd.mirrorcatalogs.com/snapshots/packages/amd64
 --------------------------------------------------------------------------------
 
 
diff --git a/cdist/conf/type/__package_pkg_openbsd/parameter/optional b/cdist/conf/type/__package_pkg_openbsd/parameter/optional
index 77fd22b3..43278d16 100644
--- a/cdist/conf/type/__package_pkg_openbsd/parameter/optional
+++ b/cdist/conf/type/__package_pkg_openbsd/parameter/optional
@@ -1,3 +1,4 @@
 name
 flavor
 state
+pkg_path
diff --git a/cdist/conf/type/__qemu_img/man.text b/cdist/conf/type/__qemu_img/man.text
index 39188ab0..0fe2bbec 100644
--- a/cdist/conf/type/__qemu_img/man.text
+++ b/cdist/conf/type/__qemu_img/man.text
@@ -14,17 +14,15 @@ The qemu-img program is used to create qemu images for
 qemu and (qemu-)kvm.
 
 
-REQUIRED PARAMETERS
--------------------
-size::
-    Size of the image in qemu-img compatible units.
-    See qemu-img(1).
-
 
 OPTIONAL PARAMETERS
 -------------------
 state::
     Either "present" or "absent", defaults to "present"
+size::
+    Size of the image in qemu-img compatible units.
+
+    Required if state is "present".
 
 
 EXAMPLES
@@ -42,9 +40,10 @@ __qemu_img /home/services/kvm/vm/myoldvm/system-disk --state absent
 SEE ALSO
 --------
 - cdist-type(7)
+- qemu-img(1)
 
 
 COPYING
 -------
-Copyright \(C) 2012 Nico Schottelius. Free use of this software is
+Copyright \(C) 2012-2014 Nico Schottelius. 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/__qemu_img/manifest b/cdist/conf/type/__qemu_img/manifest
index 6d50037f..bb2c9366 100644
--- a/cdist/conf/type/__qemu_img/manifest
+++ b/cdist/conf/type/__qemu_img/manifest
@@ -3,11 +3,23 @@
 #
 
 format="$(cat "$__object/parameter/format")"
-state="$(cat "$__object/parameter/state")"
+state_should="$(cat "$__object/parameter/state")"
 
 diskimage="/$__object_id"
 
-# Absent is ensured by __file, present by gencode-remote
-if [ "$state" = "absent" ]; then
-    __file "$diskimage" --state absent
-fi
+case "$state_should" in
+    present)
+        if [ ! -f "$__object/parameter/size" ]; then
+            echo "Size is required when state is present" >&2
+            exit 1
+        fi
+    ;;
+    absent)
+        # Absent is ensured by __file, present by gencode-remote
+        __file "$diskimage" --state absent
+    ;;
+    *)
+        echo "Unsupported state: $state_should" >&2
+        exit 1
+    ;;
+esac
diff --git a/cdist/conf/type/__qemu_img/parameter/optional b/cdist/conf/type/__qemu_img/parameter/optional
index 71b9a32b..21aa421b 100644
--- a/cdist/conf/type/__qemu_img/parameter/optional
+++ b/cdist/conf/type/__qemu_img/parameter/optional
@@ -1,2 +1,3 @@
 format
 state
+size
diff --git a/cdist/conf/type/__qemu_img/parameter/required b/cdist/conf/type/__qemu_img/parameter/required
deleted file mode 100644
index 2a613ba5..00000000
--- a/cdist/conf/type/__qemu_img/parameter/required
+++ /dev/null
@@ -1 +0,0 @@
-size
diff --git a/cdist/conf/type/__rbenv/man.text b/cdist/conf/type/__rbenv/man.text
new file mode 100644
index 00000000..c6ed5de2
--- /dev/null
+++ b/cdist/conf/type/__rbenv/man.text
@@ -0,0 +1,49 @@
+cdist-type__rbenv(7)
+====================
+Nico Schottelius <nico-cdist--@--schottelius.org>
+
+
+NAME
+----
+cdist-type__rbenv - Manage rbenv installation
+
+
+DESCRIPTION
+-----------
+This cdist type allows you to manage rbenv installations.
+It also installs ruby-build.
+
+
+OPTIONAL PARAMETERS
+-------------------
+state::
+    Either "present" or "absent", defaults to "present"
+
+owner::
+    Which user should own the rbenv installation, defaults to root
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+# Install rbenv including ruby-build for nico
+__rbenv /home/nico
+
+# Install rbenv including ruby-build for nico
+__rbenv /home/nico --owner nico
+
+# Bastian does not need rbenv anymore, he began to code C99
+__rbenv /home/bastian --state absent
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+
+
+COPYING
+-------
+Copyright \(C) 2012-2014 Nico Schottelius. 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/__rbenv/manifest b/cdist/conf/type/__rbenv/manifest
new file mode 100644
index 00000000..767abdba
--- /dev/null
+++ b/cdist/conf/type/__rbenv/manifest
@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# 2012-2014 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# 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/>.
+#
+#
+
+homedir="$__object_id"
+
+state_should="$(cat "$__object/parameter/state")"
+owner="$(cat "$__object/parameter/owner")"
+
+rbenvdir="$homedir/.rbenv"
+rubybuilddir="$rbenvdir/plugins/ruby-build"
+
+__git "$rbenvdir" \
+    --source git://github.com/sstephenson/rbenv.git \
+    --owner "$owner" \
+    --state "$state_should"
+
+require="__git/$rbenvdir" __git "$rubybuilddir" \
+    --source git://github.com/sstephenson/ruby-build.git \
+    --owner "$owner" \
+    --state "$state_should"
diff --git a/cdist/conf/type/__rbenv/parameter/default/state b/cdist/conf/type/__rbenv/parameter/default/state
new file mode 100644
index 00000000..e7f6134f
--- /dev/null
+++ b/cdist/conf/type/__rbenv/parameter/default/state
@@ -0,0 +1 @@
+present
diff --git a/cdist/conf/type/__rbenv/parameter/optional b/cdist/conf/type/__rbenv/parameter/optional
new file mode 100644
index 00000000..ff72b5c7
--- /dev/null
+++ b/cdist/conf/type/__rbenv/parameter/optional
@@ -0,0 +1 @@
+state
diff --git a/cdist/conf/type/__rbenv/parameter/required b/cdist/conf/type/__rbenv/parameter/required
new file mode 100644
index 00000000..7ee3bde8
--- /dev/null
+++ b/cdist/conf/type/__rbenv/parameter/required
@@ -0,0 +1 @@
+owner
diff --git a/cdist/conf/type/__ssh_authorized_keys/explorer/group b/cdist/conf/type/__ssh_authorized_keys/explorer/group
new file mode 100755
index 00000000..cdea6fe7
--- /dev/null
+++ b/cdist/conf/type/__ssh_authorized_keys/explorer/group
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# 2014 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/>.
+#
+
+gid="$("$__type_explorer/passwd" | cut -d':' -f 4)"
+getent group "$gid" || true
diff --git a/cdist/conf/type/__ssh_authorized_keys/man.text b/cdist/conf/type/__ssh_authorized_keys/man.text
index 7177f26e..9fd683fd 100644
--- a/cdist/conf/type/__ssh_authorized_keys/man.text
+++ b/cdist/conf/type/__ssh_authorized_keys/man.text
@@ -40,9 +40,6 @@ state::
 file::
    an alternative destination file, defaults to ~$owner/.ssh/authorized_keys
 
-comment::
-   an optional comment
-
 
 BOOLEAN PARAMETERS
 ------------------
@@ -67,12 +64,11 @@ __ssh_authorized_keys root \
 __ssh_authorized_keys user-name \
    --key "ssh-rsa AXYZAAB3NzaC1yc2..."
 
-# same as above, but with explicit owner, two keys and a comment
+# same as above, but with explicit owner and two keys
 __ssh_authorized_keys some-fancy-id \
    --owner user-name \
    --key "ssh-rsa AXYZAAB3NzaC1yc2..." \
-   --key "ssh-rsa AZXYAAB3NzaC1yc2..." \
-   --comment "allow the members of project foo to login"
+   --key "ssh-rsa AZXYAAB3NzaC1yc2..."
 
 # same as above, but authorized_keys file in non standard location
 __ssh_authorized_keys some-fancy-id \
@@ -97,5 +93,5 @@ SEE ALSO
 
 COPYING
 -------
-Copyright \(C) 2012 Steven Armstrong. Free use of this software is
+Copyright \(C) 2012-2014 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/__ssh_authorized_keys/manifest b/cdist/conf/type/__ssh_authorized_keys/manifest
index 5a9cfbb3..1c9df208 100755
--- a/cdist/conf/type/__ssh_authorized_keys/manifest
+++ b/cdist/conf/type/__ssh_authorized_keys/manifest
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
-# 2012 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2012-2014 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2014 Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #
@@ -32,7 +33,7 @@ else
 fi
 
 if [ ! -f "$__object/parameter/noparent" -o ! -f "$__object/parameter/nofile" ]; then
-   group="$(cut -d':' -f 4 "$__object/explorer/passwd")"
+   group="$(cut -d':' -f 1 "$__object/explorer/group")"
    if [ -z "$group" ]; then
       echo "Failed to get owners group from explorer." >&2
       exit 1
@@ -56,16 +57,32 @@ if [ ! -f "$__object/parameter/noparent" -o ! -f "$__object/parameter/nofile" ];
    fi
 fi
 
-# Generate entry for inclusion in authorized_keys file
-(
-if [ -f "$__object/parameter/comment" ]; then
-   echo "# $(cat "$__object/parameter/comment")"
-fi
-cat "$__object/parameter/key"
-) | \
+# Remove legacy blocks created by old versions of this type
+# FIXME: remove me in 3.2+
 __block "$__object_name" \
    --file "$file" \
    --prefix "#cdist:$__object_name" \
    --suffix "#/cdist:$__object_name" \
-   --state "$state" \
-   --text -
+   --state 'absent' \
+   --text - << DONE
+remove legacy block
+DONE
+
+_cksum() {
+   echo "$1" | cksum | cut -d' ' -f 1
+}
+
+while read key; do
+   cksum_key="$(_cksum "$key")"
+   line_id="${owner}-${cksum_key}"
+
+   set -- "$line_id"
+   set -- "$@" --file "$file"
+   set -- "$@" --regex ".*$key.*"
+   if [ "$state" = 'present' ]; then
+      set -- "$@" --line "$key"
+   fi
+   set -- "$@" --state "$state"
+   # Ensure __line does not read stdin
+   require="__block/$__object_name" __line "$@" < /dev/null
+done < "$__object/parameter/key"
diff --git a/cdist/conf/type/__ssh_authorized_keys/parameter/optional b/cdist/conf/type/__ssh_authorized_keys/parameter/optional
index bfbd72ab..989750b3 100644
--- a/cdist/conf/type/__ssh_authorized_keys/parameter/optional
+++ b/cdist/conf/type/__ssh_authorized_keys/parameter/optional
@@ -1,4 +1,3 @@
 owner
 state
 file
-comment
diff --git a/cdist/conf/type/__user/explorer/shadow b/cdist/conf/type/__user/explorer/shadow
index a949ec51..59abaa8a 100755
--- a/cdist/conf/type/__user/explorer/shadow
+++ b/cdist/conf/type/__user/explorer/shadow
@@ -26,9 +26,10 @@ os="$($__explorer/os)"
 # Default to using shadow passwords
 database="shadow"
 
-if [ "$os" = "freebsd" ]; then
-   database="passwd"
-fi
+case "$os" in
+  "freebsd"|"openbsd")  database="passwd";;
+esac
+  
 
 getent "$database" "$name" || true
 
diff --git a/cdist/core/code.py b/cdist/core/code.py
index f128697f..5374bcdf 100644
--- a/cdist/core/code.py
+++ b/cdist/core/code.py
@@ -2,6 +2,7 @@
 #
 # 2011 Steven Armstrong (steven-cdist at armstrong.cc)
 # 2011-2013 Nico Schottelius (nico-cdist at schottelius.org)
+# 2014 Daniel Heule (hda at sfs.biz)
 #
 # This file is part of cdist.
 #
@@ -123,15 +124,27 @@ class Code(object):
         self.remote.mkdir(destination)
         self.remote.transfer(source, destination)
 
-    def _run_code(self, cdist_object, which):
+    def _run_code(self, cdist_object, which, env=None):
         which_exec = getattr(self, which)
         script = os.path.join(which_exec.object_path, getattr(cdist_object, 'code_%s_path' % which))
-        return which_exec.run_script(script)
+        return which_exec.run_script(script, env=env)
 
     def run_code_local(self, cdist_object):
         """Run the code-local script for the given cdist object."""
-        return self._run_code(cdist_object, 'local')
+        # Put some env vars, to allow read only access to the parameters over $__object
+        env = os.environ.copy()
+        env.update(self.env)
+        env.update({
+            '__object': cdist_object.absolute_path,
+            '__object_id': cdist_object.object_id,
+        })
+        return self._run_code(cdist_object, 'local', env=env)
 
     def run_code_remote(self, cdist_object):
         """Run the code-remote script for the given cdist object on the remote side."""
-        return self._run_code(cdist_object, 'remote')
+        # Put some env vars, to allow read only access to the parameters over $__object which is already on the remote side
+        env = {
+            '__object': os.path.join(self.remote.object_path, cdist_object.path),
+            '__object_id': cdist_object.object_id,
+        }
+        return self._run_code(cdist_object, 'remote', env=env)
diff --git a/docs/changelog b/docs/changelog
index 7c915994..fa474a43 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -12,8 +12,30 @@ Changelog
 	* Core: Integrate initial preos support
 
 
-3.0.10:
+3.1.2:
+	* Type __qemu_img: size is optional, if state is not present
+	* New Type: __dog_vdi
+
+3.1.1: 2014-03-26
+	* Core: Make __object and __object_id available to code (Daniel Heule)
+	* New explorer: cpu_cores (Daniel Heule/Thomas Oettli)
+	* New explorer: cpu_sockets (Daniel Heule/Thomas Oettli)
+	* New explorer: machine_type (Daniel Heule/Thomas Oettli)
+	* New explorer: memory (Daniel Heule/Thomas Oettli)
+	* Type __jail: Fix parameter names in explorer (Jake Guffey)
+	* Type __line: Ensure permissions are kept (Steven Armstrong)
+	* Type __link: Do not create link in directory, if link exists (Steven Armstrong)
+	* Type __package_pkg_openbsd: Improve error handling (og)
+
+3.1.0: 2014-03-19
+	* New Type: __rbenv
+	* Type __file: Enhance OpenBSD Support (og)
 	* Type __git: Pass onwer/group/mode values to __directory
+	* Type __iptable_rule: Fix example documentation (Antoine Catton)
+	* Type __key_value: Add messaging support
+	* Type __package_pkg_openbsd: Allow to change PKG_PATH (og)
+	* Type __ssh_authorized_keys: Allow managing existing keys (Steven Armstrong)
+	* Type __user: Enhance OpenBSD Support (og)
 
 3.0.9: 2014-02-14
 	* Core: Ignore order dependencies if override is set (Daniel Heule)
@@ -28,7 +50,6 @@ Changelog
 	* Type __rvm_gemset: Use default parameters for state (Daniel Heule)
 	* Type __rvm_ruby: Use default parameters for state (Daniel Heule)
 
-
 3.0.8: 2014-02-11
 	* Core: Enhance object id verification (Daniel Heule)
 	* Core: Add unit tests for dependencies based on execution order (Daniel Heule)
diff --git a/docs/dev/fancy-ideas b/docs/dev/fancy-ideas
index f125a884..8ee290cd 100644
--- a/docs/dev/fancy-ideas
+++ b/docs/dev/fancy-ideas
@@ -4,4 +4,14 @@
 implemented as a proof of concept at:
 https://github.com/asteven/cdist/tree/type-namespaces
 
+ 
+ 
+Execute all global explorers only when needed #286
 
+My intention is to create a brunch of global explorer which are of use in some cases and makes cdist more userfriendly. But now, all global explorers are allways executed, even the return value of the explorers is never used.
+
+I think a possible approach can be to replace the result files with pipes, and on first read of the pipe, the explorer is executed by the core, all following read calls from the pipe are answered from the core with the result of the first real execute of the explorer.
+
+So cdist can have an unlimited number of global explorers and only used explorers are executed on the target host, all other explorers laying around are simply ignored.
+
+Also a possible approach would be to create a new explorer type (dynamic explorers) which are sitting in a different directory to (for example dynexploer) and only this ones are executed with the conditional approach explained above. So the overhead to create pipes and monitor it is only in place on explorers which are not interesting for everyone ...
diff --git a/docs/dev/logs/2013-01-03.dependency-issue b/docs/dev/logs/2013-01-03.dependency-issue
new file mode 100644
index 00000000..91db9425
--- /dev/null
+++ b/docs/dev/logs/2013-01-03.dependency-issue
@@ -0,0 +1,27 @@
+
+Problem shown by using __rbenv:
+
+__rbenv/nicotest
+    __git /home/nico/.rbenv
+        __package git
+        __directory /home/nico/.rbenv
+
+    require="__git/home/nico/.rbenv" 
+        __git /home/nico/.rbenv/plugins/ruby-build
+            __package git
+            __directory /home/nico/.rbenv/plugins/ruby-build
+
+
+1) if children do NOT automatically depend on their parents requiremnts
+
+    __directory /home/nico/.rbenv/plugins/ruby-build fails:
+        because __directory /home/nico/.rbenv/plugins is created by
+        __git /home/nico/.rbenv, but __directory /home/nico/.rbenv/plugins/ruby-build
+        does not depend on __git /home/nico/.rbenv
+
+2) if children DO automatically depend on their parents requiremnts
+    __package git from __git /home/nico/.rbenv/plugins/ruby-build depends on __git /home/nico/.rbenv.
+
+    __git  /home/nico/.rbenv depends on __package git (via autorequire)
+
+    => circular dependency, they depend on each other
diff --git a/docs/dev/logs/2014-02-18.unauthenticated-packages b/docs/dev/logs/2014-02-18.unauthenticated-packages
new file mode 100644
index 00000000..5fc6357b
--- /dev/null
+++ b/docs/dev/logs/2014-02-18.unauthenticated-packages
@@ -0,0 +1,18 @@
+- we cannot install packages, which are not authenticated:
+
+INFO: voicerepublic-staging.sky.ungleich.ch: Executing code for __package_apt/deb-multimedia-keyring
+Reading package lists...
+Building dependency tree...
+Reading state information...
+The following NEW packages will be installed:
+  deb-multimedia-keyring
+  0 upgraded, 1 newly installed, 0 to remove and 13 not upgraded.
+  Need to get 14.4 kB of archives.
+  After this operation, 46.1 kB of additional disk space will be used.
+  WARNING: The following packages cannot be authenticated!
+    deb-multimedia-keyring
+    E: There are problems and -y was used without --force-yes
+    ERROR: voicerepublic-staging.sky.ungleich.ch: Command failed: ssh -o User=root -q voicerepublic-staging.sky.ungleich.ch /bin/sh -e /var/lib/cdist/object/__package_apt/deb-multimedia-keyring/.cdist/code-remote
+    INFO: cdist: Total processing time for 1 host(s): 72.07943892478943
+    ERROR: cdist: Failed to configure the following hosts: voicerepublic-staging.sky.ungleich.ch
+
diff --git a/docs/man/cdist-reference.text.sh b/docs/man/cdist-reference.text.sh
index 62614c55..cff0f9c7 100755
--- a/docs/man/cdist-reference.text.sh
+++ b/docs/man/cdist-reference.text.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
 # 2010-2013 Nico Schottelius (nico-cdist at schottelius.org)
+# 2014      Daniel Heule     (hda at sfs.biz)
 #
 # This file is part of cdist.
 #
@@ -209,10 +210,10 @@ __messages_out::
     Available for: initial manifest, type manifest, type gencode
 __object::
     Directory that contains the current object.
-    Available for: type manifest, type explorer, type gencode
+    Available for: type manifest, type explorer, type gencode and code scripts
 __object_id::
     The type unique object id.
-    Available for: type manifest, type explorer, type gencode
+    Available for: type manifest, type explorer, type gencode and code scripts
     Note: The leading and the trailing "/" will always be stripped (caused by
     the filesystem database and ensured by the core).
     Note: Double slashes ("//") will not be fixed and result in an error.
diff --git a/docs/man/man7/cdist-type.text b/docs/man/man7/cdist-type.text
index 8415f991..06026542 100644
--- a/docs/man/man7/cdist-type.text
+++ b/docs/man/man7/cdist-type.text
@@ -252,6 +252,27 @@ echo "touch /etc/cdist-configured"
 --------------------------------------------------------------------------------
 
 
+VARIABLE ACCESS FROM THE GENERATED SCRIPTS
+------------------------------------------
+In the generated scripts, you have access to the following cdist variables
+
+- __object
+- __object_id
+
+but only for read operations, means there is no back copy of this
+files after the script execution.
+
+So when you generate a script with the following content, it will work:
+
+--------------------------------------------------------------------------------
+if [ -f "$__object/parameter/name" ]; then
+   name="$(cat "$__object/parameter/name")"
+else
+   name="$__object_id"
+fi
+--------------------------------------------------------------------------------
+
+
 HINTS FOR TYPEWRITERS
 ----------------------
 It must be assumed that the target is pretty dumb and thus does not have high
diff --git a/docs/web/cdist/update.mdwn b/docs/web/cdist/update.mdwn
index 2e3e9b92..28f41da7 100644
--- a/docs/web/cdist/update.mdwn
+++ b/docs/web/cdist/update.mdwn
@@ -55,6 +55,11 @@ To upgrade to the lastet version do
 
 ## General Update Instructions
 
+### Updating from 3.0 to 3.1
+
+The type **\_\_ssh_authorized_keys** now also manages existing keys, 
+not only the ones added by cdist.
+
 ### Updating from 2.3 to 3.0
 
 The **changed** attribute of objects has been removed.