diff --git a/cdist/conf/type/__package/manifest b/cdist/conf/type/__package/manifest
index a453c32b..0a3c8681 100755
--- a/cdist/conf/type/__package/manifest
+++ b/cdist/conf/type/__package/manifest
@@ -41,7 +41,7 @@ else
                type="pkg_freebsd"
             fi
             ;;
-         gentoo) type="emerge" ;;
+         gentoo|funtoo) type="emerge" ;;
          suse) type="zypper" ;;
          openwrt) type="opkg" ;;
          openbsd) type="pkg_openbsd" ;;
diff --git a/cdist/conf/type/__service/explorer/service-manager b/cdist/conf/type/__service/explorer/service-manager
index 55a873fa..a89689a9 100755
--- a/cdist/conf/type/__service/explorer/service-manager
+++ b/cdist/conf/type/__service/explorer/service-manager
@@ -3,6 +3,8 @@
 # Assume systemd if systemctl is in PATH.
 if [ "$(command -v systemctl)" ]; then
 	printf "systemd"
+elif [ "$(command -v rc)" ]; then
+	printf "openrc"
 else
 	printf "unknown"
 fi
diff --git a/cdist/conf/type/__service/gencode-remote b/cdist/conf/type/__service/gencode-remote
index ac62e05f..2e940581 100755
--- a/cdist/conf/type/__service/gencode-remote
+++ b/cdist/conf/type/__service/gencode-remote
@@ -6,4 +6,6 @@ action="$(cat "$__object/parameter/action")"
 
 if [ "$manager" = "unknown" ]; then
 	echo "service '$name' '$action'"
+elif[ "$manager" = "openrc" ]; then
+	echo "rc-service $name $action"
 fi