diff --git a/cdist/conf/type/__jail/manifest b/cdist/conf/type/__jail/manifest
index d73c3cbf..fad6a3a1 100755
--- a/cdist/conf/type/__jail/manifest
+++ b/cdist/conf/type/__jail/manifest
@@ -1,8 +1,6 @@
 #!/bin/sh -e
 #
 # 2012 Jake Guffey (jake.guffey at eprotex.com)
-# 2026 Shannon Prickett
-# 2026 Nico Schottelius
 #
 # This file is part of cdist.
 #
@@ -45,7 +43,7 @@ for property in *; do
 	set -- "$@" "--$property" "$(cat "$property")"
 done
 
-if grep -q '^[[:digit:]]\{2,\}\.' "$__global/explorer/os_version" ; then # Version > 9.x
+if grep -q '^10\.' "$(cat "$__global/explorer/os_version")" ; then   # Version is 10.x
    __jail_freebsd10 "$@"
 else
    __jail_freebsd9 "$@"
@@ -53,3 +51,4 @@ fi
 
 # Debug
 #set +x
+
diff --git a/cdist/conf/type/__timezone/gencode-remote b/cdist/conf/type/__timezone/gencode-remote
index d8612986..b685c990 100755
--- a/cdist/conf/type/__timezone/gencode-remote
+++ b/cdist/conf/type/__timezone/gencode-remote
@@ -34,12 +34,3 @@ case "$os" in
       echo "echo \"$timezone_should\" > /etc/timezone"
    ;;
 esac
-
-case "$os" in
-    openwrt)
-        cat <<EOF
-			uci set system.@system[0].timezone="$timezone_should"
-			uci commit
-EOF
-   ;;
-esac
diff --git a/cdist/conf/type/__timezone/manifest b/cdist/conf/type/__timezone/manifest
index 307bec04..0eb7fb9c 100755
--- a/cdist/conf/type/__timezone/manifest
+++ b/cdist/conf/type/__timezone/manifest
@@ -53,10 +53,7 @@ case "$os" in
                 --file /etc/sysconfig/clock \
                 --delimiter '=' \
                 --value "\"$timezone\""
-        ;;
-    openwrt)
-        : # Uses gencode-remote
-        ;;
+    ;;
     *)
         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
diff --git a/docs/changelog b/docs/changelog
index db6d7fc6..4e9a8a6d 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -1,10 +1,6 @@
 Changelog
 ---------
 
-next:
-	* Type __timezone: Add support for OpenWRT (Nico Schottelius)
-	* Type __jail: Add support for FreeBSD > 10 (Shannon Prickett)
-
 7.0.1:
 	* Core: Remove double definition of scan parser (Nico Schottelius)
 	* Type __apt_mark: Narrow down grep for hold packages (marcoduif)