diff --git a/cdist/conf/type/__hostname/gencode-remote b/cdist/conf/type/__hostname/gencode-remote
index dbffad61..89bf7b3f 100755
--- a/cdist/conf/type/__hostname/gencode-remote
+++ b/cdist/conf/type/__hostname/gencode-remote
@@ -40,7 +40,7 @@ case "$os" in
             exit 0
         fi
     ;;
-    scientific|centos|openbsd)
+    scientific|centos|freebsd|openbsd)
         if [ "$name_sysconfig" = "$name_should" -a "$name_running" = "$name_should" ]; then
             exit 0
         fi
@@ -62,7 +62,7 @@ case "$os" in
         echo "printf '%s\n' '$name_should' > /etc/hostname"
         echo "hostname -F /etc/hostname"
     ;;
-    openbsd)
+    freebsd|openbsd)
         echo "hostname '$name_should'"
     ;;
     suse)
diff --git a/cdist/conf/type/__hostname/manifest b/cdist/conf/type/__hostname/manifest
index 4836c501..74664aa7 100755
--- a/cdist/conf/type/__hostname/manifest
+++ b/cdist/conf/type/__hostname/manifest
@@ -52,6 +52,13 @@ case "$os" in
             --key HOSTNAME \
             --value "$name_should" --exact_delimiter
     ;;
+    freebsd)
+        __key_value rcconf-hostname \
+            --file /etc/rc.conf \
+            --delimiter '=' \
+            --key 'hostname' \
+            --value "$name_should"
+    ;;
     openbsd)
         echo "$name_should" | __file /etc/myname --source -
     ;;
diff --git a/cdist/conf/type/__start_on_boot/explorer/state b/cdist/conf/type/__start_on_boot/explorer/state
index d49f01c7..d8f9b7ba 100644
--- a/cdist/conf/type/__start_on_boot/explorer/state
+++ b/cdist/conf/type/__start_on_boot/explorer/state
@@ -64,6 +64,10 @@ else
             state="present"
             [ -f "/etc/runlevels/${target_runlevel}/${name}" ] || state="absent"
         ;;
+        freebsd)
+            state="absent"
+            service -e | grep "/$name$" && state="present"
+        ;;
         *)
            echo "Unsupported os: $os" >&2
            exit 1
diff --git a/cdist/conf/type/__start_on_boot/gencode-remote b/cdist/conf/type/__start_on_boot/gencode-remote
index 63f0ba3c..14ee7dab 100755
--- a/cdist/conf/type/__start_on_boot/gencode-remote
+++ b/cdist/conf/type/__start_on_boot/gencode-remote
@@ -77,6 +77,10 @@ case "$state_should" in
                     echo "update-rc.d \"$name\" defaults >/dev/null"
                 ;;
 
+                freebsd)
+                    :  # handled in manifest
+                ;;
+
                 *)
                    echo "Unsupported os: $os" >&2
                    exit 1
diff --git a/cdist/conf/type/__start_on_boot/manifest b/cdist/conf/type/__start_on_boot/manifest
new file mode 100644
index 00000000..8bc323dc
--- /dev/null
+++ b/cdist/conf/type/__start_on_boot/manifest
@@ -0,0 +1,28 @@
+#!/bin/sh -e
+
+state_should="$(cat "$__object/parameter/state")"
+state_is=$(cat "$__object/explorer/state")
+name="$__object_id"
+
+# Short circuit if nothing is to be done
+[ "$state_should" = "$state_is" ] && exit 0
+
+os=$(cat "$__global/explorer/os")
+
+case "$os" in
+    freebsd)
+	if [ "$state_should" == 'present' ]; then
+	    value='YES'
+	else
+	    value='NO'
+	fi
+	__key_value rcconf-$name-enable \
+	    --file /etc/rc.conf \
+	    --key "${name}_enable" \
+	    --value "\"$value\"" \
+	    --delimiter '='
+    ;;
+    *)
+        : # handled in gencode-remote
+    ;;
+esac
diff --git a/cdist/conf/type/__sysctl/gencode-remote b/cdist/conf/type/__sysctl/gencode-remote
index b7fb02c8..a7aedb84 100755
--- a/cdist/conf/type/__sysctl/gencode-remote
+++ b/cdist/conf/type/__sysctl/gencode-remote
@@ -26,5 +26,15 @@ if [ "$value_should" = "$value_is" ]; then
    exit 0
 fi
 
+os=$(cat "$__global/explorer/os")
+case "$os" in
+    redhat|centos|ubuntu|debian|devuan|archlinux|coreos)
+        flag='-w'
+    ;;
+    frebsd)
+        flag=''
+    ;;
+esac
+
 # set the current runtime value
-printf 'sysctl -w %s="%s"\n' "$__object_id" "$value_should"
+printf 'sysctl %s %s="%s"\n' "$flag" "$__object_id" "$value_should"
diff --git a/cdist/conf/type/__sysctl/manifest b/cdist/conf/type/__sysctl/manifest
index 39a2e53c..c903dbae 100755
--- a/cdist/conf/type/__sysctl/manifest
+++ b/cdist/conf/type/__sysctl/manifest
@@ -22,7 +22,7 @@
 os=$(cat "$__global/explorer/os")
 
 case "$os" in
-   redhat|centos|ubuntu|debian|devuan|archlinux|coreos)
+   redhat|centos|ubuntu|debian|devuan|archlinux|coreos|freebsd)
       :
    ;;
    *)