diff --git a/srcpkgs/i3/i3-devel.template b/srcpkgs/i3/i3-devel.template
index 664de7405f..081d69de9e 100644
--- a/srcpkgs/i3/i3-devel.template
+++ b/srcpkgs/i3/i3-devel.template
@@ -1,13 +1,12 @@
 # Template file for 'i3-devel'.
 #
-depends="i3"
+noarch=yes
+depends="i3>=$version"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-do_install()
-{
+do_install() {
 	vmove usr/include usr
 }
diff --git a/srcpkgs/i3/i3.rshlibs b/srcpkgs/i3/i3.rshlibs
index a222f3e375..70f797b475 100644
--- a/srcpkgs/i3/i3.rshlibs
+++ b/srcpkgs/i3/i3.rshlibs
@@ -13,3 +13,4 @@ libyajl.so.2
 libev.so.4
 libpcre.so.0
 libstartup-notification-1.so.0
+librt.so.1
diff --git a/srcpkgs/i3/template b/srcpkgs/i3/template
index eea899db5c..6b76911bd2 100644
--- a/srcpkgs/i3/template
+++ b/srcpkgs/i3/template
@@ -1,34 +1,29 @@
 # Template file for 'i3'
 pkgname=i3
-version=4.1
+version=4.2
+revision=1
 homepage="http://i3wm.org/"
 distfiles="${homepage}/downloads/${pkgname}-${version}.tar.bz2"
-revision=2
+subpackages="${pkgname}-devel"
 depends="i3status"
-makedepends="pkg-config yajl-devel libxcb-devel xcb-proto xcb-util libev-devel flex asciidoc xmlto docbook-xml libXcursor-devel libX11-devel pcre-devel startup-notification-devel"
+makedepends="which pkg-config yajl-devel libxcb-devel libev-devel flex asciidoc xmlto docbook-xml libXcursor-devel libX11-devel pcre-devel startup-notification-devel"
+conf_files="/etc/i3/config"
 short_desc="Improved tiling window manager."
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="BSD"
-checksum=3b4f21d9bf66f8e4588521dfa706d8cc3fe1999976a55fb5a6c13a621a1455a0
+checksum=e02c832820e8922a44e744e555294f8580c2f8e218c5c1029e52f1bde048732b
 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"
-
-
-
 do_build() {
-	make ${makejobs}
-	make ${makejobs} -C man
+	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
+	install -m644 man/*.1 ${DESTDIR}/usr/share/man/man1
 }