diff --git a/srcpkgs/chroot-binutils/template b/srcpkgs/chroot-binutils/template
index 1c177ce955..e6ed346a6e 100644
--- a/srcpkgs/chroot-binutils/template
+++ b/srcpkgs/chroot-binutils/template
@@ -1,18 +1,17 @@
 # Template file for 'chroot-binutils'
 pkgname=chroot-binutils
-version=2.22
-wrksrc="binutils-${version}"
-build_style=gnu-configure
-configure_args="--disable-shared --enable-threads --disable-plugins
---enable-64-bit-bfd --with-mmap --disable-bootstrap --enable-multilib"
-make_install_args="tooldir=/usr"
-distfiles="${GNU_SITE}/binutils/binutils-$version.tar.bz2"
+version=2.22.52.0.4
 revision=1
+wrksrc="binutils-${version}"
+bootstrap=yes
+provides="binutils-${version}"
+conflicts="binutils>=0"
 short_desc="GNU binary utilities -- for xbps-src use"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/binutils/"
 license="GPL-3"
-checksum=6c7af8ed1c8cf9b4b9d6e6fe09a3e1d3d479fe63984ba8b9b26bf356b6313ca9
+distfiles="${KERNEL_SITE}/devel/binutils/binutils-$version.tar.xz"
+checksum=d88ea0bc8591098a1666d9b97b93d81098816dd16faff90d3ed15072b40e1caf
 long_desc="
  The GNU binutils package contains essential tools to assemble, link and
  manipulate binary and object files. They are often used with a compiler
@@ -28,18 +27,28 @@ long_desc="
 
  This package is only meant to be used by xbps-src, don't install it manually."
 
-bootstrap=yes
-provides="binutils-${version}"
-conflicts="binutils>=0"
+if [ -n "$IN_CHROOT" ]; then
+	makedepends="flex perl"
+fi
 
-pre_install() {
+do_configure() {
+	./configure ${CONFIGURE_SHARED_ARGS} --disable-shared \
+		--enable-threads --disable-plugins --enable-64-bit-bfd \
+		--with-mmap --disable-bootstrap --enable-multilib
+}
+
+do_build() {
+	make
+}
+
+do_install() {
 	if [ "$XBPS_MACHINE" = "x86_64" ]; then
 		mkdir -p ${DESTDIR}/usr/lib
                 cd ${DESTDIR}/usr && ln -s lib lib64 && cd ${wrksrc}
         fi
-}
 
-post_install() {
+	make DESTDIR=${DESTDIR} tooldir=/usr install
+
 	[ -h ${DESTDIR}/usr/lib64 ] && rm -f ${DESTDIR}/usr/lib64
 	rm -f ${DESTDIR}/usr/lib/*.a
 	rm -rf ${DESTDIR}/usr/share ${DESTDIR}/usr/include