diff --git a/srcpkgs/i3-devel b/srcpkgs/i3-devel
new file mode 120000
index 00000000000..41a6cd96475
--- /dev/null
+++ b/srcpkgs/i3-devel
@@ -0,0 +1 @@
+i3
\ No newline at end of file
diff --git a/srcpkgs/i3/i3-devel.template b/srcpkgs/i3/i3-devel.template
new file mode 100644
index 00000000000..ea792d326dd
--- /dev/null
+++ b/srcpkgs/i3/i3-devel.template
@@ -0,0 +1,13 @@
+# Template file for 'i3-devel'.
+#
+short_desc="${sourcepkg} - development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run i3
+
+do_install()
+{
+	vmove usr/include usr
+}
diff --git a/srcpkgs/i3/i3.rshlibs b/srcpkgs/i3/i3.rshlibs
new file mode 100644
index 00000000000..a222f3e3750
--- /dev/null
+++ b/srcpkgs/i3/i3.rshlibs
@@ -0,0 +1,15 @@
+libxcb.so.1
+libxcb-keysyms.so.1
+libxcb-aux.so.0
+libc.so.6
+libm.so.6
+libxcb-atom.so.1
+libxcb-icccm.so.1
+libxcb-xinerama.so.0
+libxcb-randr.so.0
+libXcursor.so.1
+libX11.so.6
+libyajl.so.2
+libev.so.4
+libpcre.so.0
+libstartup-notification-1.so.0
diff --git a/srcpkgs/i3/template b/srcpkgs/i3/template
new file mode 100644
index 00000000000..1e9be71b5a0
--- /dev/null
+++ b/srcpkgs/i3/template
@@ -0,0 +1,44 @@
+# Template file for 'i3'
+pkgname=i3
+version=4.1
+homepage="http://i3wm.org/"
+distfiles="${homepage}/downloads/${pkgname}-${version}.tar.bz2"
+short_desc="Improved tiling window manager."
+maintainer="davehome <davehome@redthumb.info.tm>"
+license="BSD"
+checksum=3b4f21d9bf66f8e4588521dfa706d8cc3fe1999976a55fb5a6c13a621a1455a0
+long_desc="
+ i3 is a tiling window manager, completely written from scratch. The target
+ platforms are GNU/Linux and BSD operating systems, our code is Free and Open
+ Source Software (FOSS) under the BSD license. i3 is primarily targeted at
+ advanced users and developers."
+
+subpackages="${pkgname}-devel"
+
+conf_files="/etc/i3/config"
+
+Add_dependency build pkg-config
+Add_dependency build yajl-devel
+Add_dependency build libxcb-devel
+Add_dependency build xcb-proto
+Add_dependency build xcb-util
+Add_dependency build libev-devel
+Add_dependency build flex
+Add_dependency build asciidoc
+Add_dependency build xmlto
+Add_dependency build docbook-xml
+Add_dependency build libXcursor-devel
+Add_dependency build libX11-devel
+Add_dependency build pcre-devel
+Add_dependency build startup-notification-devel
+
+do_build() {
+	make ${makejobs}
+	make ${makejobs} -C man
+}
+
+do_install() {
+	make ${makejobs} DESTDIR=${DESTDIR} install
+	vmkdir usr/share/man/man1
+	cp ${wrksrc}/man/*.1 ${DESTDIR}/usr/share/man/man1
+}