diff --git a/common/shlibs b/common/shlibs
index 83655ec413..257a2c675f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -927,8 +927,11 @@ libisofs.so.6			libisofs		libisofs-devel
 libbfd-2.22.so			binutils		binutils-devel
 libopcodes-2.22.so		binutils		binutils-devel
 libv8.so			libv8			v8-devel
-libGeoIP.so.1		libgeoip		geoip-devel
-libGeoIPUpdate.so.0	libgeoip		geoip-devel
-libcherokee-base.so.0	libcherokee		cherokee-devel
-libcherokee-client.so.0	libcherokee		cherokee-devel
-libcherokee-server.so.0	libcherokee		cherokee-devel
+libGeoIP.so.1			libgeoip		geoip-devel
+libGeoIPUpdate.so.0		libgeoip		geoip-devel
+libcherokee-base.so.0		libcherokee		cherokee-devel
+libcherokee-client.so.0		libcherokee		cherokee-devel
+libcherokee-server.so.0		libcherokee		cherokee-devel
+libnilfs.so.0			libnilfs		nilfs-utils-devel
+libnilfsgc.so.0			libnilfs		nilfs-utils-devel
+libnilfscleaner.so.0		libnilfs		nilfs-utils-devel
diff --git a/srcpkgs/libnilfs b/srcpkgs/libnilfs
new file mode 120000
index 0000000000..4d97541ece
--- /dev/null
+++ b/srcpkgs/libnilfs
@@ -0,0 +1 @@
+nilfs-utils
\ No newline at end of file
diff --git a/srcpkgs/nilfs-utils-devel b/srcpkgs/nilfs-utils-devel
new file mode 120000
index 0000000000..4d97541ece
--- /dev/null
+++ b/srcpkgs/nilfs-utils-devel
@@ -0,0 +1 @@
+nilfs-utils
\ No newline at end of file
diff --git a/srcpkgs/nilfs-utils/depends b/srcpkgs/nilfs-utils/depends
new file mode 100644
index 0000000000..5b6269ad02
--- /dev/null
+++ b/srcpkgs/nilfs-utils/depends
@@ -0,0 +1,2 @@
+abi_depends=">=2.1.0"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/nilfs-utils/libnilfs.rshlibs b/srcpkgs/nilfs-utils/libnilfs.rshlibs
new file mode 100644
index 0000000000..5cfb38aad3
--- /dev/null
+++ b/srcpkgs/nilfs-utils/libnilfs.rshlibs
@@ -0,0 +1,4 @@
+libpthread.so.0
+libc.so.6
+librt.so.1
+libuuid.so.1
diff --git a/srcpkgs/nilfs-utils/libnilfs.template b/srcpkgs/nilfs-utils/libnilfs.template
new file mode 100644
index 0000000000..ed944d1faf
--- /dev/null
+++ b/srcpkgs/nilfs-utils/libnilfs.template
@@ -0,0 +1,10 @@
+# Template file for 'libnilfs'.
+#
+short_desc="NILFS userspace runtime libraries"
+long_desc="${long_desc}
+
+ This package contains the NILFS runtime libraries."
+
+do_install() {
+	vmove "usr/lib/*.so*" usr/lib
+}
diff --git a/srcpkgs/nilfs-utils/nilfs-utils-devel.template b/srcpkgs/nilfs-utils/nilfs-utils-devel.template
new file mode 100644
index 0000000000..9880a7a4d4
--- /dev/null
+++ b/srcpkgs/nilfs-utils/nilfs-utils-devel.template
@@ -0,0 +1,15 @@
+# Template file for 'nilfs-devel'.
+#
+short_desc="NILFS userspace development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libuuid-devel
+Add_dependency run libmount-devel
+Add_dependency run libnilfs
+
+do_install() {
+        vmove usr/include usr
+	vmove "usr/lib/*.a" usr/lib
+}
diff --git a/srcpkgs/nilfs-utils/nilfs-utils.rshlibs b/srcpkgs/nilfs-utils/nilfs-utils.rshlibs
new file mode 100644
index 0000000000..4cef2f0694
--- /dev/null
+++ b/srcpkgs/nilfs-utils/nilfs-utils.rshlibs
@@ -0,0 +1,8 @@
+libpthread.so.0
+libc.so.6
+librt.so.1
+libuuid.so.1
+libmount.so.1
+libnilfs.so.0
+libnilfsgc.so.0
+libnilfscleaner.so.0
diff --git a/srcpkgs/nilfs-utils/template b/srcpkgs/nilfs-utils/template
new file mode 100644
index 0000000000..64385bea70
--- /dev/null
+++ b/srcpkgs/nilfs-utils/template
@@ -0,0 +1,22 @@
+# Template file for 'nilfs-utils'
+pkgname=nilfs-utils
+version=2.1.0
+homepage="http://www.nilfs.org"
+distfiles="$homepage/download/$pkgname-$version.tar.bz2"
+build_style=gnu-configure
+short_desc="A log-structured file system for Linux - userspace utils"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2, LGPL-2.1"
+checksum=53fd797534257a3036b9bdffdac63d407c1906397d6fe71f461bd4200a543eed
+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
+ files mistakenly overwritten or destroyed just a few seconds ago.
+
+ This package contains the required userspace utilities."
+
+conf_files="/etc/nilfs_cleanerd.conf"
+subpackages="libnilfs ${pkgname}-devel"
+
+Add_dependency build libuuid-devel
+Add_dependency build libmount-devel