diff --git a/srcpkgs/i3/template b/srcpkgs/i3/template
index 3a87dff87b..877b299ea1 100644
--- a/srcpkgs/i3/template
+++ b/srcpkgs/i3/template
@@ -1,7 +1,7 @@
 # Template file for 'i3'
 pkgname=i3
 version=4.5.1
-revision=2
+revision=3
 short_desc="Improved tiling window manager"
 maintainer="davehome <davehome@redthumb.info.tm>"
 license="BSD"
@@ -14,13 +14,17 @@ long_desc="
  Source Software (FOSS) under the BSD license. i3 is primarily targeted at
  advanced users and developers."
 
-makedepends="which perl pkg-config pcre-devel>=8.30 yajl-devel libxcb-devel
- libev-devel asciidoc xmlto libXcursor-devel pango-devel
- xcb-util-devel>=0.3.9 xcb-util-keysyms-devel>=0.3.9 xcb-util-wm-devel>=0.3.9
- startup-notification-devel>=0.12_3"
+hostmakedepends="which perl pkg-config asciidoc xmlto"
+makedepends="pcre-devel>=8.30 yajl-devel libxcb-devel libev-devel
+ libXcursor-devel pango-devel startup-notification-devel>=0.12_3
+ xcb-util-devel>=0.3.9 xcb-util-keysyms-devel>=0.3.9 xcb-util-wm-devel>=0.3.9"
 
 do_build() {
-	make ${makejobs}
+	if [ "$CROSS_BUILD" ]; then
+		export PKG_CONFIG_PATH="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
+		export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
+	fi
+	make CC="$CC" LD="$LD" CFLAGS="$CFLAGS" ${makejobs}
 	make ${makejobs} -C man
 }
 
@@ -31,7 +35,7 @@ do_install() {
 }
 
 i3-devel_package() {
-	short_desc="${short_desc} - development files"
+	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 	}
@@ -41,7 +45,6 @@ i3_package() {
 	depends="i3status rxvt-unicode dmenu"
 	conf_files="/etc/i3/config /etc/i3/config.keycodes"
 	pkg_install() {
-		vmove etc
-		vmove usr
+		vmove all
 	}
 }