diff --git a/cdist/conf/explorer/hostname b/cdist/conf/explorer/hostname
index dca004d1..7715c6b0 100755
--- a/cdist/conf/explorer/hostname
+++ b/cdist/conf/explorer/hostname
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
-# 2019 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
+# 2010-2014 Nico Schottelius (nico-cdist at schottelius.org)
+# 2012 Steven Armstrong (steven-cdist at armstrong.cc)
 #
 # This file is part of cdist.
 #
@@ -18,12 +19,7 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 #
-# Retrieve the running hostname
-#
 
-if command -v hostname >/dev/null
-then
-	hostname
-else
-	uname -n
+if command -v uname >/dev/null; then
+   uname -n
 fi
diff --git a/cdist/conf/lib/errors.sh b/cdist/conf/lib/errors.sh
new file mode 100644
index 00000000..0aa0437a
--- /dev/null
+++ b/cdist/conf/lib/errors.sh
@@ -0,0 +1,16 @@
+__cdist_unsupported_os() {
+    if [ $# -gt 0 ]
+    then
+        os=$1
+        shift
+    else
+        os=$(cat "$__explorer/os")
+    fi
+	printf "Your operating system \"%s\" is currently not supported.\nPlease contribute an implementation for it if you can.\n" "${os}" >&2
+	exit 1
+}
+
+__cdist_error() {
+    printf "$@" >&2
+    exit 1
+}
diff --git a/cdist/conf/type/__git/gencode-remote b/cdist/conf/type/__git/gencode-remote
index ab22655f..4de0f1c6 100755
--- a/cdist/conf/type/__git/gencode-remote
+++ b/cdist/conf/type/__git/gencode-remote
@@ -35,8 +35,7 @@ owner=$(cat "$__object/parameter/owner")
 group=$(cat "$__object/parameter/group")
 mode=$(cat "$__object/parameter/mode")
 
-[ -f "$__object/parameter/recursive" ] && recursive='--recurse-submodules' || recursive=''
-[ -f "$__object/parameter/shallow" ] && shallow='--depth 1 --shallow-submodules' || shallow=''
+[ -f "$__object/parameter/recursive" ] && recursive='--recursive' || recursive=''
 
 [ "$state_should" = "$state_is" ] \
  && [ "$owner" = "$owner_is" ] \
@@ -46,7 +45,7 @@ mode=$(cat "$__object/parameter/mode")
 case $state_should in
     present)
         if [ "$state_should" != "$state_is" ]; then
-            echo git clone --quiet "$recursive" "$shallow" --branch "$branch" "$source" "$destination"
+            echo git clone --quiet "$recursive" --branch "$branch" "$source" "$destination"
         fi
         if { [ -n "$owner" ] && [ "$owner_is" != "$owner" ]; } || \
            { [ -n "$group" ] && [ "$group_is" != "$group" ]; }; then
diff --git a/cdist/conf/type/__git/man.rst b/cdist/conf/type/__git/man.rst
index d3e15f25..144eadda 100644
--- a/cdist/conf/type/__git/man.rst
+++ b/cdist/conf/type/__git/man.rst
@@ -36,11 +36,7 @@ owner
    User to chown to.
 
 recursive
-   Passes the --recurse-submodules flag to git when cloning the repository.
-
-shallow
-   Sets --depth=1 and --shallow-submodules for cloning repositories with big history.
-
+   Passes the --recursive flag to git when cloning the repository.
 
 EXAMPLES
 --------
diff --git a/cdist/conf/type/__git/parameter/boolean b/cdist/conf/type/__git/parameter/boolean
index d600d4ca..a633e659 100644
--- a/cdist/conf/type/__git/parameter/boolean
+++ b/cdist/conf/type/__git/parameter/boolean
@@ -1,2 +1 @@
 recursive
-shallow
diff --git a/cdist/conf/type/__grafana_dashboard/manifest b/cdist/conf/type/__grafana_dashboard/manifest
index d145c4c3..e652202b 100755
--- a/cdist/conf/type/__grafana_dashboard/manifest
+++ b/cdist/conf/type/__grafana_dashboard/manifest
@@ -15,10 +15,6 @@ case $os in
                 # Differntation not needed anymore
                 apt_source_distribution=stable
                 ;;
-            10*)
-                # Differntation not needed anymore
-                apt_source_distribution=stable
-                ;;
             *)
                 echo "Don't know how to install Grafana on $os $os_version. Send us a pull request!" >&2
                 exit 1
@@ -33,9 +29,10 @@ case $os in
                     --uri https://packages.grafana.com/oss/deb \
                     --distribution $apt_source_distribution \
                     --component main
+
         __package apt-transport-https
-        require="$require __apt_source/grafana" __apt_update_index
-        require="$require  __package/apt-transport-https __apt_update_index" __package grafana
+
+        require="$require __apt_source/grafana __package/apt-transport-https" __package grafana
         require="$require __package/grafana" __start_on_boot grafana-server
         require="$require __start_on_boot/grafana-server" __process grafana-server --start "service grafana-server start"
         ;;
diff --git a/cdist/conf/type/__group/explorer/group b/cdist/conf/type/__group/explorer/group
index dc673f61..8c8e840d 100755
--- a/cdist/conf/type/__group/explorer/group
+++ b/cdist/conf/type/__group/explorer/group
@@ -23,7 +23,7 @@
 #
 
 not_supported() {
-	echo "Your operating system ($("$__explorer/os")) is currently not supported." >&2
+	echo "Your operating system ($(cat "$__explorer/os")) is currently not supported." >&2
 	echo "Cannot extract group information." >&2
 	echo "Please contribute an implementation for it if you can." >&2
 	exit 1
diff --git a/cdist/conf/type/__group/explorer/gshadow b/cdist/conf/type/__group/explorer/gshadow
index 05841d69..c0dce1e3 100755
--- a/cdist/conf/type/__group/explorer/gshadow
+++ b/cdist/conf/type/__group/explorer/gshadow
@@ -23,7 +23,7 @@
 #
 
 name=$__object_id
-os=$("$__explorer/os")
+os=$(cat "$__explorer/os")
 
 not_supported() {
 	echo "Your operating system ($os) is currently not supported." >&2
diff --git a/cdist/conf/type/__hostname/explorer/has_hostnamectl b/cdist/conf/type/__hostname/explorer/has_hostnamectl
index 2f531f30..9040023d 100755
--- a/cdist/conf/type/__hostname/explorer/has_hostnamectl
+++ b/cdist/conf/type/__hostname/explorer/has_hostnamectl
@@ -21,4 +21,4 @@
 # Check whether system has hostnamectl
 #
 
-command -v hostnamectl 2>/dev/null || true
+command -v hostnamectl || true
diff --git a/cdist/conf/type/__xymon_config/gencode-remote b/cdist/conf/type/__hostname/explorer/hostname_file
old mode 100644
new mode 100755
similarity index 71%
rename from cdist/conf/type/__xymon_config/gencode-remote
rename to cdist/conf/type/__hostname/explorer/hostname_file
index b25a0fda..6a00aa9f
--- a/cdist/conf/type/__xymon_config/gencode-remote
+++ b/cdist/conf/type/__hostname/explorer/hostname_file
@@ -1,6 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
 #
-# 2018-2019 Thomas Eckert (tom at it-eckert.de)
+# 2014 Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #
@@ -16,8 +16,15 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Retrieve the contents of /etc/hostname
+#
 
-## to speed up config-reload we send a HUP to the server process:
-cat <<-EOT
-	pkill -HUP xymond || { echo "HUPing xymond failed" >&2; exit 1; }
-EOT
+# Almost any distribution
+if [ -f /etc/hostname ]; then
+    cat /etc/hostname
+# SuSE
+elif [ -f /etc/HOSTNAME ]; then
+    cat /etc/HOSTNAME
+fi
diff --git a/cdist/conf/type/__xymon_apache/explorer/active-conf b/cdist/conf/type/__hostname/explorer/hostname_sysconfig
similarity index 75%
rename from cdist/conf/type/__xymon_apache/explorer/active-conf
rename to cdist/conf/type/__hostname/explorer/hostname_sysconfig
index bd281e21..d0d7b4e7 100755
--- a/cdist/conf/type/__xymon_apache/explorer/active-conf
+++ b/cdist/conf/type/__hostname/explorer/hostname_sysconfig
@@ -1,6 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
 #
-# 2018-2019 Thomas Eckert (tom at it-eckert.de)
+# 2014 Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #
@@ -16,7 +16,11 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Retrieve the contents of /etc/hostname
+#
 
-if [ -d /etc/apache2/mods-enabled ]; then
-	ls -1 /etc/apache2/conf-enabled/
+if [ -f /etc/sysconfig/network ]; then
+    awk -F= '/^HOSTNAME=/ { print $2 }' /etc/sysconfig/network
 fi
diff --git a/cdist/conf/type/__hostname/explorer/max_len b/cdist/conf/type/__hostname/explorer/max_len
deleted file mode 100644
index fb863949..00000000
--- a/cdist/conf/type/__hostname/explorer/max_len
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh -e
-
-command -v getconf >/dev/null || exit 0
-
-val=$(getconf HOST_NAME_MAX 2>/dev/null) || exit 0
-
-if test -n "${val}" -a "${val}" != 'undefined'
-then
-	echo "${val}"
-fi
diff --git a/cdist/conf/type/__hostname/gencode-remote b/cdist/conf/type/__hostname/gencode-remote
index ae224611..8b5797dd 100755
--- a/cdist/conf/type/__hostname/gencode-remote
+++ b/cdist/conf/type/__hostname/gencode-remote
@@ -2,7 +2,6 @@
 #
 # 2014-2017 Steven Armstrong (steven-cdist at armstrong.cc)
 # 2014 Nico Schottelius (nico-cdist at schottelius.org)
-# 2019 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
 #
 # This file is part of cdist.
 #
@@ -20,81 +19,60 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
-os=$(cat "$__global/explorer/os")
-name_running=$(cat "$__global/explorer/hostname")
-has_hostnamectl=$(cat "$__object/explorer/has_hostnamectl")
-
-
-if test -s "$__object/parameter/name"
-then
-    name_should=$(cat "$__object/parameter/name")
+if [ -f "$__object/parameter/name" ]; then
+    name_should="$(cat "$__object/parameter/name")"
 else
-    case $os
-    in
-        # RedHat-derivatives and BSDs
-        centos|fedora|redhat|scientific|freebsd|macosx|netbsd|openbsd)
-            # Hostname is FQDN
-            name_should="${__target_host}"
-        ;;
-        *)
-            # Hostname is only first component of FQDN
-            name_should="${__target_host%%.*}"
-        ;;
-    esac
+    name_should="${__target_host%%.*}"
 fi
 
+os=$(cat "$__global/explorer/os")
+name_running=$(cat "$__global/explorer/hostname")
+name_config=$(cat "$__object/explorer/hostname_file")
+name_sysconfig=$(cat "$__object/explorer/hostname_sysconfig")
+has_hostnamectl=$(cat "$__object/explorer/has_hostnamectl")
 
 ################################################################################
-# Check if the (running) hostname is already correct
+# If everything is ok -> exit
 #
-test "$name_running" != "$name_should" || exit 0
-
+case "$os" in
+    archlinux|debian|suse|ubuntu|devuan|coreos|alpine)
+        if [ "$name_config" = "$name_should" ] && [ "$name_running" = "$name_should" ]; then
+            exit 0
+        fi
+    ;;
+    scientific|centos|freebsd|openbsd)
+        if [ "$name_sysconfig" = "$name_should" ] && [ "$name_running" = "$name_should" ]; then
+            exit 0
+        fi
+    ;;
+    *)
+        echo "Unsupported os: $os" >&2
+        exit 1
+    ;;
+esac
 
 ################################################################################
 # Setup hostname
 #
-echo 'changed' >>"$__messages_out"
+echo changed >> "$__messages_out"
 
-# Use the good old way to set the hostname.
-case $os
-in
-    alpine|debian|devuan|ubuntu)
-        echo 'hostname -F /etc/hostname'
+# Use the good old way to set the hostname even on machines running systemd.
+case "$os" in
+    archlinux|debian|ubuntu|devuan|centos|coreos|alpine)
+        printf "printf '%%s\\\\n' '$name_should' > /etc/hostname\\n"
+        echo "hostname -F /etc/hostname"
     ;;
-    archlinux)
-        echo 'command -v hostnamectl >/dev/null 2>&1' \
-            "&& hostnamectl set-hostname '$name_should'" \
-            "|| hostname '$name_should'"
-    ;;
-    centos|fedora|redhat|scientific|freebsd|netbsd|openbsd|gentoo|void)
+    freebsd|openbsd)
         echo "hostname '$name_should'"
     ;;
-    macosx)
-        echo "scutil --set HostName '$name_should'"
-    ;;
-    solaris)
-        echo "uname -S '$name_should'"
-    ;;
-    slackware|suse|opensuse-leap)
-        # We do not read from /etc/HOSTNAME, because the running
-        # hostname is the first component only while the file contains
-        # the FQDN.
+    suse)
         echo "hostname '$name_should'"
-    ;;
-    *)
-        # Fall back to set the hostname using hostnamectl, if available.
-        if test -n "$has_hostnamectl"
-        then
-            # Don't use hostnamectl as the primary means to set the hostname for
-            # systemd systems, because it cannot be trusted to work reliably and
-            # exit with non-zero when it fails (e.g. hostname too long,
-            # D-Bus failure, etc.).
-
-            echo "hostnamectl set-hostname \"\$(cat /etc/hostname)\""
-            echo "test \"\$(hostname)\" = \"\$(cat /etc/hostname)\"" \
-                 " || hostname -F /etc/hostname"
-        else
-            printf "echo 'Unsupported OS: %s' >&2\nexit 1\n" "$os"
-        fi
+        printf "printf '%%s\\\\n' '$name_should' > /etc/HOSTNAME\\n"
     ;;
 esac
+
+if [ "$has_hostnamectl" ]; then
+    # Allow hostnamectl set-hostname to fail silently.
+    # Who the fuck invented a tool that needs dbus to set the hostname anyway ...
+    echo "hostnamectl set-hostname '$name_should' || true"
+fi
diff --git a/cdist/conf/type/__hostname/man.rst b/cdist/conf/type/__hostname/man.rst
index 72aefbab..d23a3b8a 100644
--- a/cdist/conf/type/__hostname/man.rst
+++ b/cdist/conf/type/__hostname/man.rst
@@ -8,10 +8,7 @@ cdist-type__hostname - Set the hostname
 
 DESCRIPTION
 -----------
-Sets the hostname on various operating systems.
-
-**Tip:** For advice on choosing a hostname, see
-`RFC 1178 <https://tools.ietf.org/html/rfc1178>`_.
+Set's the hostname on various operating systems.
 
 
 REQUIRED PARAMETERS
@@ -21,7 +18,7 @@ None.
 OPTIONAL PARAMETERS
 -------------------
 name
-   The hostname to set. Defaults to the first segment of __target_host
+   The hostname to set. Defaults to the first segment of __target_host 
    (${__target_host%%.*})
 
 
diff --git a/cdist/conf/type/__hostname/manifest b/cdist/conf/type/__hostname/manifest
index 75a90027..8f1adf12 100755
--- a/cdist/conf/type/__hostname/manifest
+++ b/cdist/conf/type/__hostname/manifest
@@ -2,7 +2,6 @@
 #
 # 2012 Steven Armstrong (steven-cdist at armstrong.cc)
 # 2014 Nico Schottelius (nico-cdist at schottelius.org)
-# 2019 Dennis Camera (dennis.camera at ssrq-sds-fds.ch)
 #
 # This file is part of cdist.
 #
@@ -20,170 +19,50 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 
-not_supported() {
-    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
-}
-
-set_hostname_systemd() {
-    echo "$1" | __file /etc/hostname --source -
-}
-
 os=$(cat "$__global/explorer/os")
-os_version=$(cat "$__global/explorer/os_version")
-os_major=$(echo "$os_version" | grep -o '^[0-9][0-9]*')
-
-max_len=$(cat "$__object/explorer/max_len")
-has_hostnamectl=$(cat "$__object/explorer/has_hostnamectl")
-
-if test -s "$__object/parameter/name"
-then
-    name_should=$(cat "$__object/parameter/name")
+if [ -f "$__object/parameter/name" ]; then
+    name_should="$(cat "$__object/parameter/name")"
 else
-    case $os
-    in
-        # RedHat-derivatives and BSDs
-        centos|fedora|redhat|scientific|freebsd|netbsd|openbsd|slackware)
-            # Hostname is FQDN
-            name_should="${__target_host}"
-        ;;
-        suse|opensuse-leap)
-            # Classic SuSE stores the FQDN in /etc/HOSTNAME, while
-            # systemd does not. The running hostname is the first
-            # component in both cases.
-            # In versions before 15.x, the FQDN is stored in /etc/hostname.
-            if test -n "$has_hostnamectl" && test "$os_major" -ge 15 \
-                    && test "$os_major" -ne 42
-            then
-                name_should="${__target_host%%.*}"
-            else
-                name_should="${__target_host}"
-            fi
-        ;;
-        *)
-            # Hostname is only first component of FQDN on all other systems.
-            name_should="${__target_host%%.*}"
-        ;;
+    case "$os" in
+    openbsd)
+        name_should="${__target_host}"
+    ;;
+    *)
+        name_should="${__target_host%%.*}"
+    ;;
     esac
 fi
 
-if test -n "$max_len" && test "$(printf '%s' "$name_should" | wc -c)" -gt "$max_len"
-then
-    printf "Host name too long. Up to %u characters allowed.\n" "${max_len}" >&2
-    exit 1
-fi
 
-case $os
-in
-    alpine|debian|devuan|ubuntu|void)
-        echo "$name_should" | __file /etc/hostname --source -
-    ;;
-    archlinux)
-        if test -n "$has_hostnamectl"
-        then
-            set_hostname_systemd "$name_should"
-        else
-            echo 'Ancient ArchLinux variants without hostnamectl are not supported.' >&2
-            exit 1
-            # Only for ancient ArchLinux, write to /etc/rc.conf on pre-systemd
-            # versions.  There are some versions which use /etc/hostname but not
-            # systemd. It is unclear which ones these are.
+not_supported() {
+   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
+}
 
-            # __key_value '/etc/rc.conf:HOSTNAME' \
-            #     --file /etc/rc.conf \
-            #     --delimiter '=' --exact_delimiter \
-            #     --key 'HOSTNAME' \
-            #     --value "\"$name_should\""
-        fi
-        ;;
-    centos|fedora|redhat|scientific)
-        if test -z "$has_hostnamectl"
-        then
-            # Only write to /etc/sysconfig/network on non-systemd versions.
-            # On systemd-based versions this entry is ignored.
-            __key_value '/etc/sysconfig/network:HOSTNAME' \
-                --file /etc/sysconfig/network \
-                --delimiter '=' --exact_delimiter \
-                --key HOSTNAME \
-                --value "\"$name_should\""
-        else
-            set_hostname_systemd "$name_should"
-        fi
-    ;;
-    gentoo)
-        # Only write to /etc/conf.d/hostname on OpenRC-based installations.
-        # On systemd use hostnamectl(1) in gencode-remote.
-        if test -z "$has_hostnamectl"
-        then
-            __key_value '/etc/conf.d/hostname:hostname' \
-                --file /etc/conf.d/hostname \
-                --delimiter '=' --exact_delimiter \
-                --key 'hostname' \
-                --value "\"$name_should\""
-        else
-            set_hostname_systemd "$name_should"
-        fi
-    ;;
-    freebsd)
-        __key_value '/etc/rc.conf:hostname' \
-            --file /etc/rc.conf \
-            --delimiter '=' --exact_delimiter \
-            --key 'hostname' \
-            --value "\"$name_should\""
-    ;;
-    macosx)
+case "$os" in
+    archlinux|debian|suse|ubuntu|devuan|coreos|alpine)
         # handled in gencode-remote
         :
     ;;
-    netbsd)
-        __key_value '/etc/rc.conf:hostname' \
+    scientific|centos)
+        __key_value sysconfig-hostname \
+            --file /etc/sysconfig/network \
+            --delimiter '=' \
+            --key HOSTNAME \
+            --value "$name_should" --exact_delimiter
+    ;;
+    freebsd)
+        __key_value rcconf-hostname \
             --file /etc/rc.conf \
-            --delimiter '=' --exact_delimiter \
+            --delimiter '=' \
             --key 'hostname' \
-            --value "\"$name_should\""
-
-        # To avoid confusion, ensure that the hostname is only stored once.
-        __file /etc/myname --state absent
+            --value "$name_should"
     ;;
     openbsd)
         echo "$name_should" | __file /etc/myname --source -
     ;;
-    slackware)
-        # We write the FQDN into /etc/HOSTNAME.  But /etc/rc.d/rc.M will only
-        # read the first component from this file and set it as the running
-        # hostname on boot.
-        echo "$name_should" | __file /etc/HOSTNAME --source -
-    ;;
-    solaris)
-        echo "$name_should" | __file /etc/nodename --source -
-    ;;
-    suse|opensuse-leap)
-        # Modern SuSE provides /etc/HOSTNAME as a symlink for
-        # backwards-compatibility. Unfortunately it cannot be used
-        # here as __file does not follow the symlink.
-        # Therefore, we use the presence of the hostnamectl binary as
-        # an indication of which file to use.  This unfortunately does
-        # not work correctly on openSUSE 12.x which provides
-        # hostnamectl but not /etc/hostname.
-
-        if test -n "$has_hostnamectl" -a "$os_major" -gt 12
-        then
-            hostname_file='/etc/hostname'
-        else
-            hostname_file='/etc/HOSTNAME'
-        fi
-
-        echo "$name_should" | __file "$hostname_file" --source -
-    ;;
     *)
-        # On other operating systems we fall back to systemd's
-        # hostnamectl if available…
-        if test -n "$has_hostnamectl"
-        then
-            set_hostname_systemd "$name_should"
-        else
-            not_supported
-        fi
+        not_supported
     ;;
 esac
diff --git a/cdist/conf/type/__letsencrypt_cert/manifest b/cdist/conf/type/__letsencrypt_cert/manifest
index 68ecf9d4..1d96ee1a 100755
--- a/cdist/conf/type/__letsencrypt_cert/manifest
+++ b/cdist/conf/type/__letsencrypt_cert/manifest
@@ -7,12 +7,6 @@ if [ -z "${certbot_fullpath}" ]; then
 	os_version="$(cat "${__global}/explorer/os_version")"
 
 	case "$os" in
-        archlinux)
-            __package certbot
-            ;;
-        alpine)
-            __package certbot
-            ;;
 		debian)
 			case "$os_version" in
 				8*)
@@ -42,7 +36,6 @@ if [ -z "${certbot_fullpath}" ]; then
 				10*)
 					__package_apt certbot
 				;;
-
 				*)
 					echo "Unsupported OS version: $os_version" >&2
 					exit 1
diff --git a/cdist/conf/type/__package_update_index/explorer/currage b/cdist/conf/type/__package_update_index/explorer/currage
index cfb778d5..3539b8e1 100644
--- a/cdist/conf/type/__package_update_index/explorer/currage
+++ b/cdist/conf/type/__package_update_index/explorer/currage
@@ -34,9 +34,6 @@ case "$type" in
             echo 0
         fi
         ;;
-    alpine)
-        echo 0
-        ;;
     *)  echo "Your specified type ($type) is currently not supported." >&2
         echo "Please contribute an implementation for it if you can." >&2
         ;;
diff --git a/cdist/conf/type/__package_update_index/explorer/type b/cdist/conf/type/__package_update_index/explorer/type
index c98e1e67..35254c5f 100644
--- a/cdist/conf/type/__package_update_index/explorer/type
+++ b/cdist/conf/type/__package_update_index/explorer/type
@@ -26,7 +26,6 @@ else
         amazon|scientific|centos|fedora|redhat) echo "yum" ;;
         debian|ubuntu|devuan) echo "apt" ;;
         archlinux) echo "pacman" ;;
-        alpine) echo "apk" ;;
         *)
             echo "Don't know how to manage packages on: $os" >&2
             exit 1
diff --git a/cdist/conf/type/__package_update_index/gencode-remote b/cdist/conf/type/__package_update_index/gencode-remote
index 9b2ecba2..738d38eb 100755
--- a/cdist/conf/type/__package_update_index/gencode-remote
+++ b/cdist/conf/type/__package_update_index/gencode-remote
@@ -47,10 +47,6 @@ case "$type" in
         echo "pacman --noprogressbar --sync --refresh"
         echo "pacman package database synced (age was: $currage)" >> "$__messages_out"
         ;;
-    alpine)
-        echo "apk update"
-        echo "apk package database updated."
-        ;;
     *)
         echo "Don't know how to manage packages for type: $type" >&2
         exit 1
diff --git a/cdist/conf/type/__prometheus_alertmanager/manifest b/cdist/conf/type/__prometheus_alertmanager/manifest
index cf410c44..8ee818c3 100755
--- a/cdist/conf/type/__prometheus_alertmanager/manifest
+++ b/cdist/conf/type/__prometheus_alertmanager/manifest
@@ -30,7 +30,6 @@ if [ -f "$__object/parameter/install-from-backports" ]; then
 		*)
 			echo "--install-from-backports is only supported on Devuan -- ignoring." >&2
 			echo "Send a pull request if you require it." >&2
-			exit 1
 		;;
 	esac
 else
@@ -61,5 +60,5 @@ require="$require __directory/$storage_path $require_pkg" \
 __config_file $CONF \
 	--source "$config" \
 	--group prometheus --mode 640 \
-	--onchange "service prometheus-alertmanager restart"  # TODO when a config-check tool is available, check config here
+	--onchange "service prometheus-alertmanager reload"  # TODO when a config-check tool is available, check config here
 
diff --git a/cdist/conf/type/__prometheus_exporter/manifest b/cdist/conf/type/__prometheus_exporter/manifest
index f3930ac6..b9e14531 100644
--- a/cdist/conf/type/__prometheus_exporter/manifest
+++ b/cdist/conf/type/__prometheus_exporter/manifest
@@ -5,11 +5,9 @@ export GOBIN=/opt/gocode/bin  # where to find go binaries
 exporter="$(cat "$__object/parameter/exporter")"
 [ -z "$exporter" ] && exporter="$__object_id"
 
-__user prometheus
-require="__user/prometheus" __group prometheus
-require="__group/prometheus" __user_groups prometheus --group prometheus
+__user prometheus --system
 
-require="__user_groups/prometheus"
+require=""
 case $exporter in
 	node)
 		TEXTFILES=/service/node-exporter/textfiles  # path for the textfiles collector
diff --git a/cdist/conf/type/__prometheus_server/manifest b/cdist/conf/type/__prometheus_server/manifest
index 9756169e..73a0799c 100755
--- a/cdist/conf/type/__prometheus_server/manifest
+++ b/cdist/conf/type/__prometheus_server/manifest
@@ -38,8 +38,7 @@ if [ -f "$__object/parameter/install-from-backports" ]; then
 	esac
 else
 	__package prometheus
-	__package prometheus-blackbox-exporter
-	require_pkg="__package/prometheus __package/prometheus-blackbox-exporter"
+	require_pkg="__package/prometheus"
 fi
 
 ##### PREPARE PATHS AND SUCH ################################################
@@ -60,7 +59,7 @@ require="$require __directory/$storage_path $require_pkg" \
 __config_file $CONF \
 	--source "$config" \
 	--group prometheus --mode 640 \
-	--onchange "promtool check config $CONF && service prometheus restart"
+	--onchange "promtool check config $CONF && service prometheus reload"
 
 for file in $rule_files; do
 	dest=$CONF_DIR/$(basename "$file")
@@ -68,6 +67,6 @@ for file in $rule_files; do
 	__config_file "$dest" \
 		--source "$file" \
 		--owner prometheus \
-		--onchange "promtool check rules '$dest' && service prometheus restart"
+		--onchange "promtool check rules '$dest' && service prometheus reload"
 done
 
diff --git a/cdist/conf/type/__sensible_editor/explorer/editor_path b/cdist/conf/type/__sensible_editor/explorer/editor_path
deleted file mode 100644
index dcf63c9b..00000000
--- a/cdist/conf/type/__sensible_editor/explorer/editor_path
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/bin/sh -e
-#
-# 2019 Dennis Camera (dennis.camera at ssrq-sds-fds.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/>.
-#
-#
-# Check if the given editor is present on the target system and determine its
-# absolute path.
-#
-
-die() {
-	echo "$@" >&2
-	exit 1
-}
-
-editor_missing() { die "Editor '$1' is missing on the target system."; }
-editor_no_alternative() {
-	die "Editor '$1' is not in the alternatives list of the target system." \
-		"$(test -n "${editors}" && printf '\nPlease choose one of:\n\n%s\n' "${editors}")"
-}
-
-# No need to check for the path if the file is supposed to be removed.
-test "$(cat "${__object}/parameter/state")" != 'absent' || exit 0
-
-
-case $("${__explorer}/os")
-in
-	debian|devuan|ubuntu)
-		has_alternatives=true
-
-		# NOTE: Old versions do not support `--list`, in this case ignore the errors.
-		#       This will require an absolute path to be provided, though.
-		editors=$(update-alternatives --list editor 2>/dev/null)
-		;;
-	*)
-		# NOTE: RedHat has an alternatives system but it doesn't usually track
-		#       editors and it is a pain to extract the list.
-		has_alternatives=false
-		;;
-esac
-
-# Read --editor parameter and check its value since it is "optional"
-editor=$(cat "${__object}/parameter/editor" 2>/dev/null) || true
-test -n "${editor}" || die 'Please provide an --editor to configure.'
-
-case $editor
-in
-	/*)
-		is_abspath=true
-		;;
-	*/*)
-		die 'Relative editor paths are not supported'
-		;;
-	*)
-		is_abspath=false
-		;;
-esac
-
-
-if $has_alternatives && test -n "${editors}"
-then
-	IFS='
-'
-	if ! $is_abspath
-	then
-		# First, try to resolve the absolute path using $editors.
-		while true
-		do
-			for e in $editors
-			do
-				if test "$(basename "${e}")" = "${editor}"
-				then
-					editor="${e}"
-					break 2  # break out of both loops
-				fi
-			done
-
-			# Iterating through alternatives did not yield a result
-			editor_no_alternative "${editor}"
-			break
-		done
-	fi
-
-	# Check if editor is present
-	test -f "${editor}" || editor_missing "${editor}"
-
-	for e in $editors
-	do
-		if test "${editor}" = "${e}"
-		then
-			# Editor is part of the alternatives list -> use it!
-			echo "${editor}"
-			exit 0
-		fi
-	done
-
-	editor_no_alternative "${editor}"
-else
-	# NOTE: This branch is mostly for RedHat-based systems which do
-	#       not track editor alternatives.  To make this type useful
-	#       on RedHat at all we allow an absoloute path to be provided
-	#       in any case.
-
-	if $is_abspath
-	then
-		test -x "${editor}" || editor_missing "${editor}"
-
-		echo "${editor}"
-		exit 0
-	else
-		die "The target doesn't list any editor alternatives. " \
-		    "Please specify an absolute path or populate the alternatives list."
-	fi
-fi
-
-# The script should never reach this statement!
-exit 1
diff --git a/cdist/conf/type/__sensible_editor/explorer/group b/cdist/conf/type/__sensible_editor/explorer/group
deleted file mode 100644
index 5d288189..00000000
--- a/cdist/conf/type/__sensible_editor/explorer/group
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh -e
-#
-# 2019 Dennis Camera (dennis.camera at ssrq-sds-fds.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/>.
-#
-#
-# Determines the primary group of the user.
-#
-
-user=$__object_id
-
-id -gn "${user}" 2>/dev/null
diff --git a/cdist/conf/type/__sensible_editor/explorer/user_home b/cdist/conf/type/__sensible_editor/explorer/user_home
deleted file mode 100644
index b88243f7..00000000
--- a/cdist/conf/type/__sensible_editor/explorer/user_home
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh -e
-#
-# 2019 Dennis Camera (dennis.camera at ssrq-sds-fds.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/>.
-#
-#
-# Determines the home folder of the target user.
-#
-
-user=$__object_id
-home=$(getent passwd "${user}" | cut -d':' -f6)
-
-if ! test -d "${home}"
-then
-	echo "Cannot find home directory of user ${user}" >&2
-	exit 1
-fi
-
-echo "${home}"
diff --git a/cdist/conf/type/__sensible_editor/man.rst b/cdist/conf/type/__sensible_editor/man.rst
deleted file mode 100644
index 9b805e06..00000000
--- a/cdist/conf/type/__sensible_editor/man.rst
+++ /dev/null
@@ -1,78 +0,0 @@
-cdist-type__sensible_editor(7)
-==============================
-
-NAME
-----
-cdist-type__sensible_editor - Select the sensible-editor
-
-
-DESCRIPTION
------------
-This cdist type allows you to select the :strong:`sensible-editor` for
-a given user.
-
-
-REQUIRED PARAMETERS
--------------------
-editor
-    Name or path of the editor to be selected.
-    On systems other than Debian derivatives an absolute path is required.
-
-	It is permissible to omit this parameter if --state is absent.
-
-
-OPTIONAL PARAMETERS
--------------------
-state
-    'present', 'absent', or 'exists'. Defaults to 'present', where:
-
-    present
-        the sensible-editor is exactly what is specified in --editor.
-    absent
-        no sensible-editor configuration is present.
-    exists
-        the sensible-editor will be set to what is specified in --editor,
-        unless there already is a configuration on the target system.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
-    __sensible_editor root --editor /bin/ed  # ed(1) is the standard
-    __sensible_editor noob --editor nano
-
-
-LIMITATIONS
------------
-
-This type depends upon the :strong:`sensible-editor`\ (1) script which
-is part of the sensible-utils package.
-
-Therefore, the following operating systems are supported:
-  * Debian 8 (jessie) or later
-  * Devuan
-  * Ubuntu 8.10 (intrepid) or later
-  * RHEL/CentOS 7 or later (EPEL repo required)
-  * Fedora 21 or later
-
-Note: on old versions of Ubuntu the sensible-* utils are part of the
-debianutils package.
-
-SEE ALSO
---------
-:strong:`select-editor`\ (1), :strong:`sensible-editor`\ (1).
-
-
-AUTHOR
--------
-Dennis Camera <dennis.camera--@--ssrq-sds-fds.ch>
-
-
-COPYING
--------
-Copyright \(C) 2019 Dennis Camera.
-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.
diff --git a/cdist/conf/type/__sensible_editor/manifest b/cdist/conf/type/__sensible_editor/manifest
deleted file mode 100644
index 1cdb0c2c..00000000
--- a/cdist/conf/type/__sensible_editor/manifest
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/sh -e
-# -*- mode: sh; indent-tabs-mode: t -*-
-#
-# 2019 Dennis Camera (dennis.camera at ssrq-sds-fds.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/>.
-#
-
-version_ge() {
-	awk -F '[^0-9.]' -v target="${1:?}" '
-	function max(x, y) { return x > y ? x : y; }
-	BEGIN {
-		getline;
-		nx = split($1, x, ".");
-		ny = split(target, y, ".");
-		for (i = 1; i <= max(nx, ny); ++i) {
-			diff = int(x[i]) - int(y[i]);
-			if (diff < 0) exit 1;
-			else if (diff > 0) exit 0;
-			else continue;
-		}
-	}'
-}
-
-not_supported() {
-	echo "OS ${os} does not support __sensible_editor." >&2
-	echo 'If it does, please provide a patch.' >&2
-	exit 1
-}
-
-os=$(cat "${__global}/explorer/os")
-os_version=$(cat "${__global}/explorer/os_version")
-
-state=$(cat "${__object}/parameter/state")
-user=$__object_id
-
-if test "${state}" != 'present' && test "${state}" != 'exists' && test "${state}" != 'absent'
-then
-	echo 'Only "present", "exists", and "absent" are allowed for --state' >&2
-	exit 1
-fi
-
-package_name='sensible-utils'
-
-case $os
-in
-	debian)
-		pkg_type='apt'
-		;;
-	devuan)
-		pkg_type='apt'
-		;;
-	ubuntu)
-		(echo "${os_version}" | version_ge 10.04) || package_name='debianutils'
-		pkg_type='apt'
-		;;
-	centos|fedora|redhat|scientific)
-		pkg_type='yum'
-		;;
-	*)
-		not_supported
-		;;
-esac
-
-if test "${state}" != 'absent'
-then
-	__package "${package_name}" --state present \
-		--type "${pkg_type}"
-	export require="__package/${package_name}"
-fi
-
-editor_path=$(cat "${__object}/explorer/editor_path")
-user_home=$(cat "${__object}/explorer/user_home")
-group=$(cat "${__object}/explorer/group")
-
-__file "${user_home}/.selected_editor" --state "${state}" \
-	--owner "${user}" --group "${group}" --mode 0644 \
-	--source - <<EOF
-# Managed by cdist
-SELECTED_EDITOR="${editor_path}"
-EOF
diff --git a/cdist/conf/type/__sensible_editor/parameter/default/state b/cdist/conf/type/__sensible_editor/parameter/default/state
deleted file mode 100644
index e7f6134f..00000000
--- a/cdist/conf/type/__sensible_editor/parameter/default/state
+++ /dev/null
@@ -1 +0,0 @@
-present
diff --git a/cdist/conf/type/__sensible_editor/parameter/optional b/cdist/conf/type/__sensible_editor/parameter/optional
deleted file mode 100644
index ae55e240..00000000
--- a/cdist/conf/type/__sensible_editor/parameter/optional
+++ /dev/null
@@ -1,2 +0,0 @@
-editor
-state
diff --git a/cdist/conf/type/__xymon_apache/explorer/active-modules b/cdist/conf/type/__xymon_apache/explorer/active-modules
deleted file mode 100755
index 4c745ced..00000000
--- a/cdist/conf/type/__xymon_apache/explorer/active-modules
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh -e
-
-if [ -d /etc/apache2/mods-enabled ]; then
-	/usr/sbin/apachectl -t -D DUMP_MODULES | awk '/.*_module/ { gsub(/_module.*$/, ""); gsub(/^ /, ""); print }' 
-fi
diff --git a/cdist/conf/type/__xymon_apache/gencode-remote b/cdist/conf/type/__xymon_apache/gencode-remote
deleted file mode 100755
index e7d8e344..00000000
--- a/cdist/conf/type/__xymon_apache/gencode-remote
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh -e
-#
-# 2018-2019 Thomas Eckert (tom at it-eckert.de)
-#
-# 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=$(cat "$__object/parameter/state")
-
-os=$(cat "$__global/explorer/os")
-case "$os" in
-	debian|ubuntu)
-		:
-	;;
-	*)
-		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
-
-if [ "$state" = "present"  ]; then
-	if ! grep -q ^rewrite "$__object/explorer/active-modules"; then
-		echo "a2enmod rewrite >/dev/null"
-		echo "mod:rewrite enabled" >> "$__messages_out"
-	fi
-	if ! grep -q "^cgi$" "$__object/explorer/active-modules"; then
-		echo "a2enmod cgi >/dev/null"
-		echo "mod:cgi enabled" >> "$__messages_out"
-	fi
-
-	if ! grep -q ^xymon.conf "$__object/explorer/active-conf"; then
-		echo "a2enconf xymon >/dev/null"
-		echo "conf:xymon enabled" >> "$__messages_out"
-	fi
-fi
-
-if grep -q "^mod:.* enabled" "$__messages_out"; then
-	echo "systemctl restart apache2.service"
-	echo "apache restarted" >> "$__messages_out"
-elif grep -q "^conf:xymon enabled" "$__messages_out"; then
-	echo "systemctl reload apache2.service"
-	echo "apache reloaded" >> "$__messages_out"
-fi
diff --git a/cdist/conf/type/__xymon_apache/man.rst b/cdist/conf/type/__xymon_apache/man.rst
deleted file mode 100644
index 8358c821..00000000
--- a/cdist/conf/type/__xymon_apache/man.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-cdist-type__xymon_apache(7)
-===========================
-
-NAME
-----
-cdist-type__xymon_apache - Configure apache2-webserver for Xymon
-
-
-DESCRIPTION
------------
-This cdist type installs and configures apache2 to be used "exclusively" (in
-the sense that no other use is taken care of) with Xymon (the systems and
-network monitor).
-
-It depends on `__xymon_server`.
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-
-OPTIONAL PARAMETERS
--------------------
-state
-   'present', 'absent', defaults to 'present'.
-
-ipacl
-   IP(-ranges) that have access to the Xymon webpages and CGIs. Apache2-style
-   syntax suitable for `Require ip ...`. Example: `192.168.1.0/24 10.0.0.0/8`
-
-
-MESSAGES
---------
-mod:rewrite enabled
-   apache module enabled
-conf:xymon enabled
-   apache config for xymon enabled
-apache restarted
-   apache2.service was reloaded
-apache reloaded
-   apache2.service was restarted
-
-
-EXPLORERS
----------
-active-conf
-   lists apache2 `conf-enabled`
-active-modules
-   lists active apache2-modules
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
-    # minmal, only localhost-access:
-    __xymon_apache
-    # allow more IPs to access the Xymon-webinterface:
-    __xymon_apache --ipacl "192.168.0.0/16 10.0.0.0/8" --state "present"
-
-
-SEE ALSO
---------
-:strong:`cdist__xymon_server`\ (7)
-
-
-AUTHORS
--------
-Thomas Eckert <tom--@--it-eckert.de>
-
-
-COPYING
--------
-Copyright \(C) 2018-2019 Thomas Eckert. 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.
diff --git a/cdist/conf/type/__xymon_apache/manifest b/cdist/conf/type/__xymon_apache/manifest
deleted file mode 100755
index bfd0af79..00000000
--- a/cdist/conf/type/__xymon_apache/manifest
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh -e
-#
-# 2018-2019 Thomas Eckert (tom at it-eckert.de)
-#
-# 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=$(cat "$__object/parameter/state")
-
-os=$(cat "$__global/explorer/os")
-case "$os" in
-	debian|ubuntu)
-		:
-	;;
-	*)
-		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
-
-__package apache2 --state "$state"
-
-## edit xymon.conf IP-ranges
-if [ -f "$__object/parameter/ipacl" ]; then
-	require="__package/xymon" __line /etc/apache2/conf-available/xymon.conf \
-		--line "        Require ip $(cat "$__object/parameter/ipacl")" \
-		--after "^[[:space:]]*Require local" \
-		--state "present"
-fi
diff --git a/cdist/conf/type/__xymon_apache/parameter/default/state b/cdist/conf/type/__xymon_apache/parameter/default/state
deleted file mode 100644
index e7f6134f..00000000
--- a/cdist/conf/type/__xymon_apache/parameter/default/state
+++ /dev/null
@@ -1 +0,0 @@
-present
diff --git a/cdist/conf/type/__xymon_apache/parameter/optional b/cdist/conf/type/__xymon_apache/parameter/optional
deleted file mode 100644
index d374ec41..00000000
--- a/cdist/conf/type/__xymon_apache/parameter/optional
+++ /dev/null
@@ -1,2 +0,0 @@
-state
-ipacl
diff --git a/cdist/conf/type/__xymon_apache/singleton b/cdist/conf/type/__xymon_apache/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__xymon_client/gencode-remote b/cdist/conf/type/__xymon_client/gencode-remote
deleted file mode 100755
index 49eed317..00000000
--- a/cdist/conf/type/__xymon_client/gencode-remote
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh -e
-#
-# 2018-2019 Thomas Eckert (tom at it-eckert.de)
-#
-# 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/>.
-
-servers=$(cat "$__object/parameter/servers")
-
-if grep -q ^__key_value/CLIENTHOSTNAME "$__messages_in" || grep -q ^__key_value/XYMONSERVERS "$__messages_in" ; then
-	echo "systemctl restart xymon-client"
-	echo "restarted" >> "$__messages_out"
-	cat <<-EOT
-		echo "xymon-client xymon-client/XYMONSERVERS string $servers" | debconf-set-selections
-	EOT
-fi	
diff --git a/cdist/conf/type/__xymon_client/man.rst b/cdist/conf/type/__xymon_client/man.rst
deleted file mode 100644
index 6660b0ef..00000000
--- a/cdist/conf/type/__xymon_client/man.rst
+++ /dev/null
@@ -1,57 +0,0 @@
-cdist-type__xymon_client(7)
-===========================
-
-NAME
-----
-cdist-type__xymon_client - Install the Xymon client
-
-
-DESCRIPTION
------------
-This cdist type installs the Xymon client and configures it to report with
-FQDN.
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-
-OPTIONAL PARAMETERS
--------------------
-state
-   'present', 'absent', defaults to 'present'.
-
-servers
-   One or more IP addresses (space separated) of the Xymon server(s) to report
-   to. While DNS-names are ok it is discouraged, defaults to 127.0.0.1.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
-    # minmal, report to 127.0.0.1
-    __xymon_client
-
-    # specify server:
-    __xymon_client --servers "192.168.1.1"
-
-
-SEE ALSO
---------
-:strong:`cdist__xymon_server`\ (7), :strong:`xymon`\ (7)
-
-
-AUTHORS
--------
-Thomas Eckert <tom--@--it-eckert.de>
-
-
-COPYING
--------
-Copyright \(C) 2018-2019 Thomas Eckert. 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.
diff --git a/cdist/conf/type/__xymon_client/manifest b/cdist/conf/type/__xymon_client/manifest
deleted file mode 100755
index 92ad079e..00000000
--- a/cdist/conf/type/__xymon_client/manifest
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh -e
-#
-# 2018-2019 Thomas Eckert (tom at it-eckert.de)
-#
-# 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=$(cat "$__object/parameter/state")
-servers=$(cat "$__object/parameter/servers")
-
-os=$(cat "$__global/explorer/os")
-case "$os" in
-	debian|ubuntu)
-		:
-	;;
-	*)
-		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
-
-__package xymon-client --state "$state"
-
-require="__package/xymon-client" __key_value CLIENTHOSTNAME \
-       	--file /etc/default/xymon-client \
-	--value "'$__target_hostname'" \
-	--delimiter '=' \
-	--state "$state"
-require="__package/xymon-client" __key_value XYMONSERVERS \
-       	--file /etc/default/xymon-client \
-	--value "'$servers'" \
-	--delimiter '=' \
-	--state "$state"
-
-## CLI-usage often requires a shell:
-require="__package/xymon-client" __user xymon --shell "/bin/bash" --state "$state"
diff --git a/cdist/conf/type/__xymon_client/parameter/default/servers b/cdist/conf/type/__xymon_client/parameter/default/servers
deleted file mode 100644
index 7b9ad531..00000000
--- a/cdist/conf/type/__xymon_client/parameter/default/servers
+++ /dev/null
@@ -1 +0,0 @@
-127.0.0.1
diff --git a/cdist/conf/type/__xymon_client/parameter/default/state b/cdist/conf/type/__xymon_client/parameter/default/state
deleted file mode 100644
index e7f6134f..00000000
--- a/cdist/conf/type/__xymon_client/parameter/default/state
+++ /dev/null
@@ -1 +0,0 @@
-present
diff --git a/cdist/conf/type/__xymon_client/parameter/optional b/cdist/conf/type/__xymon_client/parameter/optional
deleted file mode 100644
index 7c34489a..00000000
--- a/cdist/conf/type/__xymon_client/parameter/optional
+++ /dev/null
@@ -1,2 +0,0 @@
-state
-servers
diff --git a/cdist/conf/type/__xymon_client/singleton b/cdist/conf/type/__xymon_client/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__xymon_config/files/.keep b/cdist/conf/type/__xymon_config/files/.keep
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__xymon_config/man.rst b/cdist/conf/type/__xymon_config/man.rst
deleted file mode 100644
index 8b427ca0..00000000
--- a/cdist/conf/type/__xymon_config/man.rst
+++ /dev/null
@@ -1,57 +0,0 @@
-cdist-type__xymon_config(7)
-===========================
-
-NAME
-----
-cdist-type__xymon_config - Deploy a Xymon configuration-directory
-
-
-DESCRIPTION
------------
-This cdist type deploys a full Xymon configuration directory from the files-dir
-to the host.  This type requires an installed Xymon server, e.g. deployed by
-`__xymon_server`.
-
-WARNING: This type _replaces_ the `/etc/xymon/`-directory! The previous
-contents is replaced/deleted!
-
-
-REQUIRED PARAMETERS
--------------------
-confdir
-   The directory in `./files/` that contains the `/etc/xymon/`-content to be
-   deployed.
-
-
-REQUIRED FILES
---------------
-The directory specified by `confdir` has to contain a valid xymon-configuration
-(`/etc/xymon/`) _plus_ the `ext/`-directory that normally resides in
-`/usr/lib/xymon/server/`.
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
-    __xymon_config --confdir=xymon.example.com
-    # this will replace /etc/xymon/ on the target host with
-    # the contents from __xymon_config/files/xymon.example.com/
-
-
-SEE ALSO
---------
-:strong:`cdist__xymon_server`\ (7), :strong:`xymon`\ (7)
-
-AUTHORS
--------
-Thomas Eckert <tom--@--it-eckert.de>
-
-
-COPYING
--------
-Copyright \(C) 2018-2019 Thomas Eckert. 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.
diff --git a/cdist/conf/type/__xymon_config/manifest b/cdist/conf/type/__xymon_config/manifest
deleted file mode 100644
index fb1bce54..00000000
--- a/cdist/conf/type/__xymon_config/manifest
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh -e
-#
-# 2018-2019 Thomas Eckert (tom at it-eckert.de)
-#
-# 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/>.
-
-confdir=$(cat "$__object/parameter/confdir")
-
-__rsync /etc/xymon/ \
-	--source "$__type/files/$confdir/" \
-	--rsync-opts "delete"
diff --git a/cdist/conf/type/__xymon_config/parameter/required b/cdist/conf/type/__xymon_config/parameter/required
deleted file mode 100644
index 43222f13..00000000
--- a/cdist/conf/type/__xymon_config/parameter/required
+++ /dev/null
@@ -1 +0,0 @@
-confdir
diff --git a/cdist/conf/type/__xymon_config/singleton b/cdist/conf/type/__xymon_config/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/conf/type/__xymon_server/gencode-remote b/cdist/conf/type/__xymon_server/gencode-remote
deleted file mode 100755
index 0770e319..00000000
--- a/cdist/conf/type/__xymon_server/gencode-remote
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh -e
-#
-# 2018-2019 Thomas Eckert (tom at it-eckert.de)
-#
-# 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/>.
-
-## "move" user-modified dirs to /etc/xymon to be managed by __xymon_config:
-cat <<-EOT
-	if [ ! -L /usr/lib/xymon/server/ext ]; then
-		mv /usr/lib/xymon/server/ext /etc/xymon
-		ln -s /etc/xymon/ext /usr/lib/xymon/server/
-	fi	
-EOT
diff --git a/cdist/conf/type/__xymon_server/man.rst b/cdist/conf/type/__xymon_server/man.rst
deleted file mode 100644
index a9a180e1..00000000
--- a/cdist/conf/type/__xymon_server/man.rst
+++ /dev/null
@@ -1,87 +0,0 @@
-cdist-type__xymon_server(7)
-===========================
-
-NAME
-----
-cdist-type__xymon_server - Install a Xymon server
-
-
-DESCRIPTION
------------
-This cdist type installs a Xymon (https://www.xymon.com/) server and (optional)
-required helper packages.
-
-This includes the Xymon client as a dependency, so NO NEED to install
-`__xymon_client` separately.
-
-To access the webinterface a webserver is required.  The cdist-type
-`__xymon_apache` can be used to install and configure the apache webserver for
-the use with Xymon.
-
-Further and day-to-day configuration of Xymon can either be done manually in
-`/etc/xymon/` or the directory can be deployed and managed by `__xymon_config`.
-
-
-REQUIRED PARAMETERS
--------------------
-None.
-
-
-OPTIONAL PARAMETERS
--------------------
-state
-    'present', 'absent', defaults to 'present'. If '--install_helpers' is
-    specified for 'absent' the helper packages will be un-installed.
-
-
-BOOLEAN PARAMETERS
-------------------
-install_helpers
-    Install helper packages used by Xymon (fping, heirloom-mailx, traceroute,
-    ntpdate).
-
-
-EXAMPLES
---------
-
-.. code-block:: sh
-
-    # minmal
-    __xymon_server
-
-    # the same
-    __xymon_server --state present
-
-    # also install helper packages:
-    __xymon_server --install_helpers
-
-    # examples to give a more complete picture: __xymon_server installed on
-    # `xymon.example.com` w/ IP 192.168.1.1:
-    #
-    # install webserver and grant 2 private subnets access to the webinterface:
-    __xymon_apache --ipacl "192.168.0.0/16 10.0.0.0/8"
-    # deploy server-configuration with __xymon_config:
-    __xymon_config --confdir=xymon.example.com
-
-    # install xymon-client on other machines (not needed on the server):
-    __xymon_client --servers "192.168.1.1"
-
-
-
-SEE ALSO
---------
-:strong:`cdist__xymon_apache`\ (7), :strong:`cdist__xymon_config`\ (7),
-:strong:`cdist__xymon_client`\ (7), :strong:`xymon`\ (7)
-
-
-AUTHORS
--------
-Thomas Eckert <tom--@--it-eckert.de>
-
-
-COPYING
--------
-Copyright \(C) 2018-2019 Thomas Eckert. 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.
diff --git a/cdist/conf/type/__xymon_server/manifest b/cdist/conf/type/__xymon_server/manifest
deleted file mode 100755
index 7cee0d23..00000000
--- a/cdist/conf/type/__xymon_server/manifest
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh -e
-#
-# 2018-2019 Thomas Eckert (tom at it-eckert.de)
-#
-# 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=$(cat "$__object/parameter/state")
-if [ -f "$__object/parameter/install_helpers" ]; then
-	install_helpers=1
-else
-	install_helpers=0
-fi
-
-os=$(cat "$__global/explorer/os")
-case "$os" in
-	debian|ubuntu)
-		:
-	;;
-	*)
-		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
-
-__package xymon --state "$state"
-
-## install helper-packages/tools used by the xymon server if requested:
-if [ "$install_helpers" = "1" ]; then
-	__package fping --state "$state"
-	__package heirloom-mailx --state "$state"
-	__package traceroute --state "$state"
-	__package ntpdate --state "$state"
-fi
-
-## CLI-usage often requires a shell:
-require="__package/xymon" __user xymon --shell "/bin/bash" --state "$state"
diff --git a/cdist/conf/type/__xymon_server/parameter/boolean b/cdist/conf/type/__xymon_server/parameter/boolean
deleted file mode 100644
index 56ebcb2c..00000000
--- a/cdist/conf/type/__xymon_server/parameter/boolean
+++ /dev/null
@@ -1 +0,0 @@
-install_helpers
diff --git a/cdist/conf/type/__xymon_server/parameter/default/state b/cdist/conf/type/__xymon_server/parameter/default/state
deleted file mode 100644
index e7f6134f..00000000
--- a/cdist/conf/type/__xymon_server/parameter/default/state
+++ /dev/null
@@ -1 +0,0 @@
-present
diff --git a/cdist/conf/type/__xymon_server/parameter/optional b/cdist/conf/type/__xymon_server/parameter/optional
deleted file mode 100644
index ff72b5c7..00000000
--- a/cdist/conf/type/__xymon_server/parameter/optional
+++ /dev/null
@@ -1 +0,0 @@
-state
diff --git a/cdist/conf/type/__xymon_server/singleton b/cdist/conf/type/__xymon_server/singleton
deleted file mode 100644
index e69de29b..00000000
diff --git a/cdist/core/code.py b/cdist/core/code.py
index 1550880a..6f8d2a97 100644
--- a/cdist/core/code.py
+++ b/cdist/core/code.py
@@ -56,6 +56,7 @@ gencode-local
         __type: full qualified path to the type's dir
         __files: full qualified path to the files dir
         __target_host_tags: comma spearated list of host tags
+        __lib: full qualified path to the lib dir
 
     returns: string containing the generated code or None
 
@@ -75,6 +76,7 @@ gencode-remote
         __type: full qualified path to the type's dir
         __files: full qualified path to the files dir
         __target_host_tags: comma spearated list of host tags
+        __lib: full qualified path to the lib dir
 
     returns: string containing the generated code or None
 
@@ -107,6 +109,7 @@ class Code(object):
             '__target_fqdn': self.target_host[2],
             '__global': self.local.base_path,
             '__files': self.local.files_path,
+            '__lib': self.local.lib_path,
             '__target_host_tags': self.local.target_host_tags,
             '__cdist_log_level': util.log_level_env_var_val(local.log),
             '__cdist_log_level_name': util.log_level_name_env_var_val(
diff --git a/cdist/core/manifest.py b/cdist/core/manifest.py
index 07af0ef8..ace31d85 100644
--- a/cdist/core/manifest.py
+++ b/cdist/core/manifest.py
@@ -44,6 +44,7 @@ common:
             == local.type_path
         __files: full qualified path to the files dir
         __target_host_tags: comma spearated list of host tags
+        __lib: full qualified path to the lib dir
 
 initial manifest is:
     script: full qualified path to the initial manifest
@@ -111,6 +112,7 @@ class Manifest(object):
             '__target_hostname': self.target_host[1],
             '__target_fqdn': self.target_host[2],
             '__files': self.local.files_path,
+            '__lib': self.local.lib_path,
             '__target_host_tags': self.local.target_host_tags,
             '__cdist_log_level': util.log_level_env_var_val(self.log),
             '__cdist_log_level_name': util.log_level_name_env_var_val(
diff --git a/cdist/exec/local.py b/cdist/exec/local.py
index f83c85df..f06a4a35 100644
--- a/cdist/exec/local.py
+++ b/cdist/exec/local.py
@@ -36,7 +36,7 @@ import cdist.message
 from cdist import core
 import cdist.exec.util as util
 
-CONF_SUBDIRS_LINKED = ["explorer", "files", "manifest", "type", ]
+CONF_SUBDIRS_LINKED = ["explorer", "files", "manifest", "type", "lib", ]
 
 
 class Local(object):
@@ -133,6 +133,7 @@ class Local(object):
                                  os.path.join(self.manifest_path, "init"))
 
         self.type_path = os.path.join(self.conf_path, "type")
+        self.lib_path = os.path.join(self.conf_path, "lib")
 
     def _init_object_marker(self):
         self.object_marker_file = os.path.join(self.base_path, "object_marker")
diff --git a/cdist/shell.py b/cdist/shell.py
index 60b6a9f0..97d6e99e 100644
--- a/cdist/shell.py
+++ b/cdist/shell.py
@@ -78,6 +78,7 @@ class Shell(object):
             '__manifest': self.local.manifest_path,
             '__explorer': self.local.global_explorer_path,
             '__files': self.local.files_path,
+            '__lib': self.local.lib_path,
             '__target_host_tags': self.local.target_host_tags,
         }
 
diff --git a/cdist/test/code/__init__.py b/cdist/test/code/__init__.py
index bf80110d..f3aedf86 100644
--- a/cdist/test/code/__init__.py
+++ b/cdist/test/code/__init__.py
@@ -101,6 +101,7 @@ class CodeTestCase(test.CdistTestCase):
                          self.cdist_object.object_id)
         self.assertEqual(output_dict['__object_name'], self.cdist_object.name)
         self.assertEqual(output_dict['__files'], self.local.files_path)
+        self.assertEqual(output_dict['__lib'], self.local.lib_path)
         self.assertEqual(output_dict['__target_host_tags'],
                          self.local.target_host_tags)
         self.assertEqual(output_dict['__cdist_log_level'],
@@ -129,6 +130,7 @@ class CodeTestCase(test.CdistTestCase):
                          self.cdist_object.object_id)
         self.assertEqual(output_dict['__object_name'], self.cdist_object.name)
         self.assertEqual(output_dict['__files'], self.local.files_path)
+        self.assertEqual(output_dict['__lib'], self.local.lib_path)
         self.assertEqual(output_dict['__target_host_tags'],
                          self.local.target_host_tags)
         self.assertEqual(output_dict['__cdist_log_level'],
diff --git a/cdist/test/manifest/__init__.py b/cdist/test/manifest/__init__.py
index 68e777a4..1486cc7c 100644
--- a/cdist/test/manifest/__init__.py
+++ b/cdist/test/manifest/__init__.py
@@ -97,6 +97,7 @@ class ManifestTestCase(test.CdistTestCase):
                          self.local.type_path)
         self.assertEqual(output_dict['__manifest'], self.local.manifest_path)
         self.assertEqual(output_dict['__files'], self.local.files_path)
+        self.assertEqual(output_dict['__lib'], self.local.lib_path)
         self.assertEqual(output_dict['__target_host_tags'],
                          self.local.target_host_tags)
         self.assertEqual(output_dict['__cdist_log_level'],
@@ -140,6 +141,7 @@ class ManifestTestCase(test.CdistTestCase):
         self.assertEqual(output_dict['__object_id'], cdist_object.object_id)
         self.assertEqual(output_dict['__object_name'], cdist_object.name)
         self.assertEqual(output_dict['__files'], self.local.files_path)
+        self.assertEqual(output_dict['__lib'], self.local.lib_path)
         self.assertEqual(output_dict['__target_host_tags'],
                          self.local.target_host_tags)
         self.assertEqual(output_dict['__cdist_log_level'],
diff --git a/docs/changelog b/docs/changelog
index 2342b0b0..5d9dab73 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -1,25 +1,7 @@
 Changelog
 ---------
 
-6.1.0: 2019-11-19
-	* Explorer hostname, type __hostname: Support more operating systems, rewrite type and hostname explorer (Dennis Camera)
-
-6.0.4: 2019-11-19
-	* Doc: Fix typos (Kirill Miazine)
-
-6.0.3: 2019-10-31
-	* Type __letsencrypt_cert: Add Alpine support (Nico Schottelius)
-	* Type __xymon_client: Fix spelling error in manpage (Dmitry Bogatov)
-	* Build: Support pip from git (Darko Poljak, Ľubomír Kučera)
-	* Type __package_update_index: Add Alpine support (Ahmed Bilal Khalid)
-
-6.0.2: 2019-10-17
-	* New types: __xymon_server, __xymon_apache, __xymon_config, __xymon_client (Thomas Eckert)
-	* Type __letsencrypt_cert: Add Arch Linux support (Nico Schottelius)
-	* New type: __sensible_editor (Dennis Camera)
-	* Types __grafana_dashboard, __prometheus_alertmanager, __prometheus_exporter, __prometheus_server: Support Debian 10 (Ahmed Bilal Khalid)
-
-6.0.1: 2019-10-08
+next:
 	* Type __group: Support OSes without getent (Dennis Camera)
 	* Type __user: Support OSes without getent (Dennis Camera)
 	* Type __ssh_authorized_keys: Support OSes without getent (Dennis Camera)
@@ -28,8 +10,6 @@ Changelog
 	* Explorer os: Unquote value from os-release file (Dennis Camera)
 	* Type __letsencrypt_cert: Support Debian 10* (Ahmed Bilal Khalid)
 	* Type __prometheus_server: Add missing exit after unsupported error message (Dominique Roux)
-	* Type __git: Use --recurse-submodules instead of --recursive (Jonas Hagen)
-	* Type __git: Add --shallow option (Jonas Hagen)
 
 6.0.0: 2019-10-01
 	* Type __letsencrypt_cert: Fix beowulf's spelling (Mondi Ravi)
diff --git a/docs/src/cdist-real-world.rst b/docs/src/cdist-real-world.rst
index ba118d63..8ccb0fc9 100644
--- a/docs/src/cdist-real-world.rst
+++ b/docs/src/cdist-real-world.rst
@@ -27,7 +27,7 @@ for that. This type will:
 - configure nginx.
 
 Our type will not create the actual python application. Its intention is only
-to configure hosting for specified user and project. It is up to the user to
+to configure hosing for specified user and project. It is up to the user to
 create his/her applications.
 
 So let's start.
@@ -480,7 +480,7 @@ Creating python bottle application
 
 We now need to create Bottle application. As you remember from the beginning
 of this walkthrough our type does not create the actual python application,
-its intention is only to configure hosting for specified user and project.
+its intention is only to configure hosing for specified user and project.
 It is up to the user to create his/her applications.
 
 Become app user::
diff --git a/docs/src/cdist-reference.rst.sh b/docs/src/cdist-reference.rst.sh
index 3ab12fe2..7bb7dc4a 100755
--- a/docs/src/cdist-reference.rst.sh
+++ b/docs/src/cdist-reference.rst.sh
@@ -81,6 +81,10 @@ confdir/files/
     Cdist does not care about this directory besides providing access to it.
     It is thought to be a general file storage area.
 
+confdir/lib/
+    Cdist does not care about this directory besides providing access to it.
+    It is thought to be a general storage for shell library files.
+
 confdir/manifest/init
     This is the central entry point.
     It is an executable (+x bit set) shell script that can use
@@ -141,6 +145,10 @@ confdir/type/<name>/files
     by cdist at any time. It can be used for storing supplementary
     files (like scripts to act as a template or configuration files).
 
+confdir/type/<name>/lib
+    This directory is reserved for user shell library files and will
+    not be used by cdist at any time.
+
 out/
     This directory contains output of cdist and is usually located
     in a temporary directory and thus will be removed after the run.
@@ -235,6 +243,10 @@ __files
     Directory that contains content from the "files" subdirectories
     from the configuration directories.
     Available for: initial manifest, type manifest, type gencode, shell.
+__lib
+    Directory that contains content from the "lib" subdirectories
+    from the configuration directories.
+    Available for: initial manifest, type manifest, type gencode, shell.
 __manifest
     Directory that contains the initial manifest.
     Available for: initial manifest, type manifest, shell.
diff --git a/docs/src/cdist-upgrade.rst b/docs/src/cdist-upgrade.rst
index 67fd4934..e57ed63c 100644
--- a/docs/src/cdist-upgrade.rst
+++ b/docs/src/cdist-upgrade.rst
@@ -11,7 +11,7 @@ To upgrade cdist in the current branch use
     git pull
 
     # Also update the manpages
-    make man
+    ./build man
     export MANPATH=$MANPATH:$(pwd -P)/doc/man
 
 If you stay on a version branche (i.e. 1.0, 1.1., ...), nothing should break.
diff --git a/hacking/timing-tests/benchmark-files.sh b/hacking/timing-tests/benchmark-files.sh
deleted file mode 100644
index c71d1c7e..00000000
--- a/hacking/timing-tests/benchmark-files.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-
-num=50000
-dsthost=localhost
-
-tmp=$(mktemp -d)
-remote_tmp=${tmp}-remote
-
-cd "$tmp"
-
-create_files() {
-    i=0
-    while [ $i -lt $num ]; do
-        echo $i > file-${i}
-        i=$((i+1))
-    done
-}
-
-delete_remote() {
-    ssh "${dsthost}" "rm -rf ${remote_tmp}"
-}
-
-
-tar_remote() {
-    cd "${tmp}"
-    tar c . | ssh "${dsthost}" "mkdir ${remote_tmp}; cd ${remote_tmp}; tar x"
-}
-
-cdist_remote()
-{
-    (
-        while [ $i -lt $num ]; do
-            echo __file ${remote_tmp}/file-${i} --source "${tmp}/file-${i}"
-            i=$((i+1))
-        done
-    ) | cdist config -i - -vv "${dsthost}"
-
-}
-
-cdist_remote_parallel()
-{
-    (
-        while [ $i -lt $num ]; do
-            echo __file ${remote_tmp}/file-${i} --source "${tmp}/file-${i}"
-            i=$((i+1))
-        done
-    ) | cdist config -j10 -i - -vv "${dsthost}"
-
-}
-
-echo "Creating ${num} files"
-time create_files
-
-echo "scping files"
-time scp -r "${tmp}" "${dsthost}:$remote_tmp" >/dev/null
-
-echo "delete remote"
-time delete_remote
-
-echo "taring files"
-time tar_remote
-
-echo "delete remote"
-time delete_remote
-
-echo "cdisting files"
-time cdist_remote
-
-echo "delete remote"
-time delete_remote
-
-echo "cdisting files (parallel)!"
-time cdist_remote
-
-echo "delete remote"
-time delete_remote
-
-echo "delete local"
-rm -rf "$tmp"
diff --git a/setup.py b/setup.py
index 2bb1e16d..ae651125 100644
--- a/setup.py
+++ b/setup.py
@@ -1,27 +1,7 @@
 from distutils.core import setup
-from distutils.errors import DistutilsError
+import cdist
 import os
 import re
-import subprocess
-
-
-# We have it only if it is a git cloned repo.
-build_helper = os.path.join('bin', 'build-helper')
-# Version file path.
-version_file = os.path.join('cdist', 'version.py')
-# If we have build-helper we could be a git repo.
-if os.path.exists(build_helper):
-    # Try to generate version.py.
-    rv = subprocess.run([build_helper, 'version', ])
-    if rv.returncode != 0:
-        raise DistutilsError("Failed to generate {}".format(version_file))
-else:
-    # Otherwise, version.py should be present.
-    if not os.path.exists(version_file):
-        raise DistutilsError("Missing version file {}".format(version_file))
-
-
-import cdist
 
 
 def data_finder(data_dir):