diff --git a/srcpkgs/open-iscsi/INSTALL b/srcpkgs/open-iscsi/INSTALL
new file mode 100644
index 00000000000..8ead5ef5b56
--- /dev/null
+++ b/srcpkgs/open-iscsi/INSTALL
@@ -0,0 +1,10 @@
+case "${ACTION}" in
+post)
+	if [ ! -s etc/iscsi/initiatorname.iscsi ]; then
+		name=$(iscsi-iname)
+		echo "Initializing InitiatorName to $name"
+		echo "InitiatorName=$name" >etc/iscsi/initiatorname.iscsi
+	fi
+        ;;
+esac
+
diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
new file mode 100644
index 00000000000..956bb8a3d82
--- /dev/null
+++ b/srcpkgs/open-iscsi/template
@@ -0,0 +1,28 @@
+# Template file for 'open-iscsi'
+pkgname=open-iscsi
+version=2.0r873
+revision=1
+wrksrc="${pkgname}-${version/r/-}"
+build_style=gnu-makefile
+make_install_args="exec_prefix=/usr sbindir=/usr/bin"
+conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
+short_desc="Open-iSCSI userland tools"
+maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
+license="GPL-2"
+homepage="http://www.open-iscsi.org/"
+distfiles="http://www.open-iscsi.org/bits/${wrksrc}.tar.gz"
+checksum=7dd9f2f97da417560349a8da44ea4fcfe98bfd5ef284240a2cc4ff8e88ac7cd9
+nocross=yes
+
+post_install() {
+	vbin usr/iscsistart
+	for m in doc/*.8; do
+		vman $m
+	done
+
+	true >${DESTDIR}/etc/iscsi/initiatorname.iscsi
+	vsconf ${DESTDIR}/etc/iscsi/ifaces/iface.example
+	rm ${DESTDIR}/etc/iscsi/ifaces/iface.example
+
+	sed -i 's,/sbin/iscsid,/usr/bin/iscsid,' ${DESTDIR}/etc/iscsi/iscsid.conf
+}