diff --git a/conf/explorer/hardware_type b/conf/explorer/hardware_type
new file mode 100755
index 00000000..5966b11e
--- /dev/null
+++ b/conf/explorer/hardware_type
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# 2010-2011 Andi Brönnimann (andi-cdist at v-net.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/>.
+#
+#
+# All os variables are lower case
+#
+#
+
+os="$($__explorer/os)"
+
+case "$os" in
+   archlinux|*bsd)
+		echo $(uname -m)
+   ;;
+esac
diff --git a/conf/type/__package_pkg_openbsd/explorer/pkg_version b/conf/type/__package_pkg_openbsd/explorer/pkg_version
new file mode 100755
index 00000000..bc23a85d
--- /dev/null
+++ b/conf/type/__package_pkg_openbsd/explorer/pkg_version
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# 2011 Andi Brönnimann (andi-cdist at v-net.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/>.
+#
+#
+# Retrieve the status of a package - parsed dpkg output
+#
+
+if [ -f "$__object/parameter/name" ]; then
+   name="$(cat "$__object/parameter/name")"
+else
+   name="$__object_id"
+fi
+
+#TODO: Is there a better way?
+pkg_info | grep "$name" | sed 's .*\(-[0-9.][0-9.]*\).* \1 ' | sed 's/-//'
diff --git a/conf/type/__package_pkg_openbsd/gencode-remote b/conf/type/__package_pkg_openbsd/gencode-remote
new file mode 100755
index 00000000..0ad85458
--- /dev/null
+++ b/conf/type/__package_pkg_openbsd/gencode-remote
@@ -0,0 +1,85 @@
+#!/bin/sh
+#
+# 2011 Andi Brönnimann (andi-cdist at v-net.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/>.
+#
+#
+# Manage packages with pkg on OpenBSD
+#
+
+# Debug
+# exec >&2
+# set -x
+
+os_version="$(cat "$__global/explorer/os_version")"
+hardware_type="$(cat "$__global/explorer/hardware_type")"
+
+
+if [ -f "$__object/parameter/flavor" ]; then
+	flavor="$(cat "$__object/parameter/flavor")"
+fi
+
+# do not show progress bar
+pkgopts="-x"
+
+if [ -f "$__object/parameter/name" ]; then
+   name="$__object/parameter/name"
+else
+   name="$__object_id"
+fi
+
+state="$(cat "$__object/parameter/state")"
+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/$hardware_type/
+
+case "$state" in
+   installed)
+      # Empty? Not installed.
+      if [ -z "$pkg_version" ]; then
+		  # use this because pkg_add doesn't properly handle errors
+		  cat << eof
+		  status=\$(pkg_add "$pkgopts" "$name--$flavor")
+
+		  # no error
+      	  if [ -n "\$status" ]; then
+			  echo "Error: \$status"
+			  exit 1
+		  fi
+eof
+      fi
+   ;;
+   removed)
+      if [ "$pkg_version" ]; then
+		  # use this because pkg_add doesn't properly handle errors
+		  cat << eof
+		  status=\$(pkg_delete "$pkgopts" "$name--$flavor")
+
+		  # no error
+      	  if [ -n "\$status" ]; then
+			  echo "Error: \$status"
+			  exit 1
+		  fi
+eof
+      fi
+   ;;
+   *)  
+		echo "Unknown state: $state" >&2
+		exit 1
+   ;;
+esac
diff --git a/conf/type/__package_pkg_openbsd/man.text b/conf/type/__package_pkg_openbsd/man.text
new file mode 100644
index 00000000..c0fae241
--- /dev/null
+++ b/conf/type/__package_pkg_openbsd/man.text
@@ -0,0 +1,58 @@
+cdist-type__package_pkg(7)
+=============================
+Andi Brönnimann <andi-cdist--@--v-net.ch>
+
+
+NAME
+----
+cdist-type__package_pkg_openbsd - Manage OpenBSD packages 
+
+
+DESCRIPTION
+-----------
+This type is usually used on OpenBSD to manage packages.
+
+
+REQUIRED PARAMETERS
+-------------------
+state::
+   Either "installed" or "removed".
+
+
+OPTIONAL PARAMETERS
+-------------------
+name::
+   If supplied, use the name and not the object id as the package name.
+
+flavor::
+   If supplied, use to avoid ambiguity.
+
+
+EXAMPLES
+--------
+
+--------------------------------------------------------------------------------
+# Ensure zsh is installed
+__package_pkg_openbsd zsh --state installed
+
+# Ensure vim is installed, use flavor no_x11
+__package_pkg_openbsd vim --state installed --flavor no_x11
+
+# If you don't want to follow pythonX packages, but always use python
+__package_pkg_openbsd python --state installed --name python2
+
+# Remove obsolete package
+__package_pkg_openbsd puppet --state removed
+--------------------------------------------------------------------------------
+
+
+SEE ALSO
+--------
+- cdist-type(7)
+- cdist-type__package(7)
+
+
+COPYING
+-------
+Copyright \(C) 2011 Andi Brönnimann. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).
diff --git a/conf/type/__package_pkg_openbsd/parameter/optional b/conf/type/__package_pkg_openbsd/parameter/optional
new file mode 100644
index 00000000..29b123ef
--- /dev/null
+++ b/conf/type/__package_pkg_openbsd/parameter/optional
@@ -0,0 +1,2 @@
+name
+flavor
diff --git a/conf/type/__package_pkg_openbsd/parameter/required b/conf/type/__package_pkg_openbsd/parameter/required
new file mode 100644
index 00000000..ff72b5c7
--- /dev/null
+++ b/conf/type/__package_pkg_openbsd/parameter/required
@@ -0,0 +1 @@
+state