diff --git a/srcpkgs/nilfs-utils/template b/srcpkgs/nilfs-utils/template
index a4e212a2c4e..1848721d099 100644
--- a/srcpkgs/nilfs-utils/template
+++ b/srcpkgs/nilfs-utils/template
@@ -1,16 +1,19 @@
 # Template file for 'nilfs-utils'
 pkgname=nilfs-utils
-version=2.1.4
-revision=3
+version=2.1.5
+revision=1
 build_style=gnu-configure
-configure_args="--enable-libmount"
+configure_args="--sbindir=/usr/bin --enable-libmount
+ ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes"
+make_install_args="sbindir=/usr/bin"
+hostmakedepends="automake libtool"
 makedepends="libuuid-devel libmount-devel"
 short_desc="A log-structured file system for Linux - userspace utils"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
 homepage="http://www.nilfs.org"
 distfiles="$homepage/download/$pkgname-$version.tar.bz2"
-checksum=8e4e7418a2e7eeb19886ec731f9a0799fd03b09a21a920e1dad8e3a9c8e6c13d
+checksum=ba9b2983f160a4af821a9552db8449a169fc6522c993fa895ab949db477d1331
 long_desc="
  NILFS is a log-structured file system supporting versioning of the entire
  file system and continuous snapshotting which allows users to even restore
@@ -18,15 +21,14 @@ long_desc="
 
  This package contains the required userspace utilities."
 
-post_install() {
-	vmkdir usr/sbin
-	mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/sbin
+pre_configure() {
+	autoreconf -fi
 }
 
 libnilfs_package() {
 	short_desc="NILFS userspace runtime libraries"
 	pkg_install() {
-		vmove "usr/lib/*.so*"
+		vmove "usr/lib/*.so.*"
 	}
 }
 
@@ -36,13 +38,13 @@ nilfs-utils-devel_package() {
 	pkg_install() {
         	vmove usr/include
 		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 	}
 }
 
 nilfs-utils_package() {
 	conf_files="/etc/nilfs_cleanerd.conf"
 	pkg_install() {
-		vmove etc
-		vmove usr
+		vmove all
 	}
 }